diff --git a/build.gradle b/build.gradle index 3308634ac..4cdc85c73 100644 --- a/build.gradle +++ b/build.gradle @@ -23,12 +23,6 @@ if (rootProject.file('src/main/resources/META-INF/accesstransformer.cfg').exists runs { // applies to all the run configs below configureEach { net.neoforged.gradle.dsl.common.runs.run.Run run -> - // Recommended logging data for a userdev environment - systemProperty 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - systemProperty 'forge.logging.console.level', 'debug' - //Limit ram usage for the dev environment to 4GB jvmArgument '-Xmx4G' diff --git a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 index ac3365432..22e56b76a 100644 --- a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 +++ b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-04T22:51:31.6049301 Item Recipes +// 1.20.4 2024-03-06T18:38:03.9906633 Item Recipes d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json @@ -55,9 +55,11 @@ bbda1becc270cf13e6b1d8e6d873aafa0951552d data/actuallyadditions/recipes/lens_of_ 4a76fa84033e80532494163fc35f60c44bdb67b5 data/actuallyadditions/recipes/player_probe.json 2f24905a9d4b0e5d3d5ecbc5a7fa3a7647f41619 data/actuallyadditions/recipes/quadruple_battery.json 80a2e4f402acab5da96bdf3acd459fce0f930c08 data/actuallyadditions/recipes/quintuple_battery.json +c6ff81ba878c02651a9353e490b3a8f9897a5410 data/actuallyadditions/recipes/rice_dough.json 5958ff2fb37430660fb22012212336320ee83dd8 data/actuallyadditions/recipes/rice_seeds.json f6c73cb2e41a8a21e2fda888b28bf52672b33d2e data/actuallyadditions/recipes/rice_slime.json 319b2d0423b79497837f5a3f940011b3bccf09f3 data/actuallyadditions/recipes/rice_slime_potion.json +2bd92dcc8b63d8577d804d172321d3a47c4b001d data/actuallyadditions/recipes/ring.json dd9f1f6cf00985f75ef5deee8e138c533e81db1a data/actuallyadditions/recipes/ring_of_growth.json 764d4f63e1d978d02419d30d2ad845b914e594c0 data/actuallyadditions/recipes/ring_of_magnetizing.json fc0a5281fc77edde16f22165e164f73dd28d7fcd data/actuallyadditions/recipes/single_battery.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 9ef3955de..88649c8cf 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-04T22:51:31.6159299 Recipes +// 1.20.4 2024-03-06T18:38:03.9956221 Recipes 4d3128b37a7153882a9324cda49b5069207561c5 data/actuallyadditions/recipes/atomic_reconstructor.json b0367f5012651764931e8b8fd0c5bcca4e8614c0 data/actuallyadditions/recipes/battery_box.json fe704716268e01ca8aeeb92196d9f660b9e08640 data/actuallyadditions/recipes/black_quartz_brick_slab.json @@ -13,9 +13,13 @@ db1978ab59369dd3c10e719073b7035acf33885c data/actuallyadditions/recipes/black_qu 86b8c5e857cf1b00e154b5f798a3e837e6a05333 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json 506d2ad2f3109a6640a35ef1a2143b16793414ba data/actuallyadditions/recipes/chiseled_black_quartz_stair.json 2e9233449531a074984b443ceef0ad782f82eaed data/actuallyadditions/recipes/chiseled_black_quartz_wall.json +f1bbeaed1616b92ee345860fedb789e0aaa74a0f data/actuallyadditions/recipes/coffee_machine.json +e14dd51bd5ccda096d709d8b3633828784a720f4 data/actuallyadditions/recipes/diamatine_crystal_block.json 49e378923a797d89b3c3c46bef00f2a347ded250 data/actuallyadditions/recipes/display_stand.json +d7a4254f48cd9043def96f7d606e237d5c5119b9 data/actuallyadditions/recipes/emeradic_crystal_block.json 7c9a004460b6eb6c6e07cedfa086294d59e5eec5 data/actuallyadditions/recipes/empowerer.json 5801963cf623f873cdb254513c1b4b5ec319dd74 data/actuallyadditions/recipes/ender_casing.json +d69c14b97aaac6879055503487e0ffe83409fa82 data/actuallyadditions/recipes/enori_crystal_block.json b2eefc77a753cbb650a879a9d30d833fc154dc58 data/actuallyadditions/recipes/ethetic_green_slab.json 1171daf9cf5402c9c47a9f2f370d5924ebddef5e data/actuallyadditions/recipes/ethetic_green_stairs.json 0e57ac576603b7c6aeef7709d2e669e3dacbe5f2 data/actuallyadditions/recipes/ethetic_green_wall.json @@ -31,10 +35,13 @@ 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 +728b2883a9325d8d5d7835d8e41af1426813f0a6 data/actuallyadditions/recipes/palis_crystal_block.json +e4ae5117c38f8c38371dd084ceb72b1910b7a34a data/actuallyadditions/recipes/restonia_crystal_block.json 532a454741e8068941f1f3c44f3be257530db8c3 data/actuallyadditions/recipes/shock_suppressor.json 7fa363b3afe88f3ffac1b9f85f59c6a291d59544 data/actuallyadditions/recipes/smooth_black_quartz_slab.json 892f9867958c77a0577adcfd8ce3f8da108ecd3e data/actuallyadditions/recipes/smooth_black_quartz_stair.json 42f29136de744f0e3629f1094136480a50bb571e data/actuallyadditions/recipes/smooth_black_quartz_wall.json bc3278bd2913d84faa511ec4668fdcb7052234a0 data/actuallyadditions/recipes/tiny_torch.json f6fe7bd7ee491106a0486211a6dc782e965102d8 data/actuallyadditions/recipes/vertical_digger.json +6b63c99b4fbe11ee0aee38551205be3b1dd64d52 data/actuallyadditions/recipes/void_crystal_block.json d5067865e97d33de5b828bc3bc5a2fcc8a16ea89 data/actuallyadditions/recipes/wood_casing.json diff --git a/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 b/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 index fb4427672..9232986bb 100644 --- a/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 +++ b/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-07T00:41:23.6076439 Item Models: actuallyadditions +// 1.20.4 2024-03-06T18:25:03.3664612 Item Models: actuallyadditions 1966de13838437bc6035f3649976a44797cf5144 assets/actuallyadditions/models/item/advanced_coil.json 24594fc68e66011dc2d7b79b92c94b387e710318 assets/actuallyadditions/models/item/advanced_leaf_blower.json ba2d814e269cdef72e1045f200b3c20ed6961517 assets/actuallyadditions/models/item/atomic_reconstructor.json @@ -47,7 +47,6 @@ e669eeb5832e40fd782df0f3ba89a27d3cadb9d3 assets/actuallyadditions/models/item/di 3318c3bb118ee0bb1008a936c72ec80dcaf59b8c assets/actuallyadditions/models/item/diamond_aiot.json 11e4961bde9e6900dc90a833108060a774783df6 assets/actuallyadditions/models/item/display_stand.json 2ed3d6a7d3b292d765616e09ca0fe03810ad80eb assets/actuallyadditions/models/item/double_battery.json -21407d7ee7e6a9afd4841e0c5f335166d00c8edc assets/actuallyadditions/models/item/dough.json 2669dbeb32101f50763c9cd7f71f5b401461dc18 assets/actuallyadditions/models/item/drill_black.json 1b836004c51c7730cb9e2b21f6e6deb036d2274e assets/actuallyadditions/models/item/drill_blue.json aa33fb2f609dfd580a0170bf59472b42430aec44 assets/actuallyadditions/models/item/drill_brown.json @@ -173,7 +172,6 @@ cf5417e23f9eab2ce0560c4fd4c6b53940ba01b1 assets/actuallyadditions/models/item/le 1a4ec0f6ed3b9b741438be7d4388676c92d0d3c1 assets/actuallyadditions/models/item/palis_crystal_block.json df692efd0af52a6b3eef1332cb2e6b5469e47dbf assets/actuallyadditions/models/item/palis_crystal_cluster.json 046fa6e050fdaeadca8da1335be501705fa84723 assets/actuallyadditions/models/item/palis_crystal_shard.json -29958f60555c7c12e36831dcc69504c8d8b52357 assets/actuallyadditions/models/item/paper_cone.json 158760d91cbb130b57b457e673e4b936b337ffc1 assets/actuallyadditions/models/item/phantom_booster.json b393ea03ae008aca117e8f7aa5a2d69ef36b827b assets/actuallyadditions/models/item/phantom_breaker.json 2e3aa5aed20b31941e10b8ae868153f25aeadde4 assets/actuallyadditions/models/item/phantom_connector.json diff --git a/src/generated/resources/assets/actuallyadditions/models/item/dough.json b/src/generated/resources/assets/actuallyadditions/models/item/dough.json deleted file mode 100644 index f3befb6ab..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/dough.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/dough" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json b/src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json deleted file mode 100644 index 5601162ab..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/paper_cone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/paper_cone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/coffee_machine.json b/src/generated/resources/data/actuallyadditions/recipes/coffee_machine.json new file mode 100644 index 000000000..9988d7baa --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/coffee_machine.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": { + "item": "actuallyadditions:coffee_beans" + }, + "I": { + "item": "actuallyadditions:iron_casing" + }, + "V": { + "item": "actuallyadditions:void_crystal" + }, + "X": { + "item": "actuallyadditions:basic_coil" + } + }, + "pattern": [ + " C ", + " I ", + "XVX" + ], + "result": { + "item": "actuallyadditions:coffee_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/diamatine_crystal_block.json b/src/generated/resources/data/actuallyadditions/recipes/diamatine_crystal_block.json new file mode 100644 index 000000000..9fffb043e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/diamatine_crystal_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "Q": { + "item": "actuallyadditions:diamatine_crystal" + } + }, + "pattern": [ + "QQQ", + "QQQ", + "QQQ" + ], + "result": { + "item": "actuallyadditions:diamatine_crystal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/emeradic_crystal_block.json b/src/generated/resources/data/actuallyadditions/recipes/emeradic_crystal_block.json new file mode 100644 index 000000000..9752ee4d3 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/emeradic_crystal_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "Q": { + "item": "actuallyadditions:emeradic_crystal" + } + }, + "pattern": [ + "QQQ", + "QQQ", + "QQQ" + ], + "result": { + "item": "actuallyadditions:emeradic_crystal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/enori_crystal_block.json b/src/generated/resources/data/actuallyadditions/recipes/enori_crystal_block.json new file mode 100644 index 000000000..ac14ee8ce --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/enori_crystal_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "Q": { + "item": "actuallyadditions:enori_crystal" + } + }, + "pattern": [ + "QQQ", + "QQQ", + "QQQ" + ], + "result": { + "item": "actuallyadditions:enori_crystal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/palis_crystal_block.json b/src/generated/resources/data/actuallyadditions/recipes/palis_crystal_block.json new file mode 100644 index 000000000..e3d9cd590 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/palis_crystal_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "Q": { + "item": "actuallyadditions:palis_crystal" + } + }, + "pattern": [ + "QQQ", + "QQQ", + "QQQ" + ], + "result": { + "item": "actuallyadditions:palis_crystal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/restonia_crystal_block.json b/src/generated/resources/data/actuallyadditions/recipes/restonia_crystal_block.json new file mode 100644 index 000000000..e5d872471 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/restonia_crystal_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "Q": { + "item": "actuallyadditions:restonia_crystal" + } + }, + "pattern": [ + "QQQ", + "QQQ", + "QQQ" + ], + "result": { + "item": "actuallyadditions:restonia_crystal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/rice_dough.json b/src/generated/resources/data/actuallyadditions/recipes/rice_dough.json new file mode 100644 index 000000000..b5c5d4634 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/rice_dough.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "actuallyadditions:rice" + }, + { + "item": "actuallyadditions:rice" + }, + { + "item": "actuallyadditions:rice" + } + ], + "result": { + "count": 2, + "item": "actuallyadditions:rice_dough" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/ring.json b/src/generated/resources/data/actuallyadditions/recipes/ring.json new file mode 100644 index 000000000..d118e0eb9 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/ring.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": { + "tag": "forge:dusts/glowstone" + }, + "G": { + "tag": "forge:ingots/gold" + }, + "I": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "IGI", + "GDG", + "IGI" + ], + "result": { + "item": "actuallyadditions:ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/void_crystal_block.json b/src/generated/resources/data/actuallyadditions/recipes/void_crystal_block.json new file mode 100644 index 000000000..aa98afdcb --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/void_crystal_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "Q": { + "item": "actuallyadditions:void_crystal" + } + }, + "pattern": [ + "QQQ", + "QQQ", + "QQQ" + ], + "result": { + "item": "actuallyadditions:void_crystal_block" + } +} \ 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 6454fed5f..3c2bc603b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -222,8 +222,23 @@ public class BlockRecipeGenerator extends RecipeProvider { .define('S', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get()) .save(recipeOutput); + //Coffee Maker + Recipe.shaped(ActuallyBlocks.COFFEE_MACHINE.getItem()) + .pattern(" C ", " I ", "XVX") + .define('C', ActuallyItems.COFFEE_BEANS) + .define('I', ActuallyBlocks.IRON_CASING.getItem()) + .define('X', ActuallyItems.BASIC_COIL.get()) + .define('V', ActuallyItems.VOID_CRYSTAL.get()) + .save(recipeOutput); + // Crystal Blocks + Recipe.block(ActuallyBlocks.RESTONIA_CRYSTAL.getItem(), ActuallyItems.RESTONIA_CRYSTAL.get(), recipeOutput); + Recipe.block(ActuallyBlocks.PALIS_CRYSTAL.getItem(), ActuallyItems.PALIS_CRYSTAL.get(), recipeOutput); + Recipe.block(ActuallyBlocks.DIAMATINE_CRYSTAL.getItem(), ActuallyItems.DIAMATINE_CRYSTAL.get(), recipeOutput); + Recipe.block(ActuallyBlocks.ENORI_CRYSTAL.getItem(), ActuallyItems.ENORI_CRYSTAL.get(), recipeOutput); + Recipe.block(ActuallyBlocks.VOID_CRYSTAL.getItem(), ActuallyItems.VOID_CRYSTAL.get(), recipeOutput); + Recipe.block(ActuallyBlocks.EMERADIC_CRYSTAL.getItem(), ActuallyItems.EMERADIC_CRYSTAL.get(), recipeOutput); } public static class Recipe { @@ -255,6 +270,10 @@ public class BlockRecipeGenerator extends RecipeProvider { Recipe.shaped(result).patternSingleKey('Q', resource, "QQQ").save(consumer); } + public static void block(ItemLike result, ItemLike resource, RecipeOutput consumer) { + Recipe.shaped(result).patternSingleKey('Q', resource, "QQQ", "QQQ", "QQQ").save(consumer); + } + private static class Shapeless extends ShapelessRecipeBuilder { public Shapeless(ItemLike result) { this(result, 1); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index 0173fe1b4..25ea9ee1c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -451,6 +451,19 @@ public class ItemRecipeGenerator extends RecipeProvider { .requires(ActuallyItems.RICE.get()) .save(recipeOutput); + //Rice Dough + Recipe.shapeless(ActuallyItems.RICE_DOUGH.get(), 2) + .requires(ActuallyItems.RICE.get(), 3) + .save(recipeOutput); + + //Ring, glow stone dust in the middle, iron in the corners, gold in the cardinals. + Recipe.shaped(ActuallyItems.RING) + .pattern("IGI", "GDG", "IGI") + .define('I', Tags.Items.INGOTS_IRON) + .define('G', Tags.Items.INGOTS_GOLD) + .define('D', Tags.Items.DUSTS_GLOWSTONE) + .save(recipeOutput); + //Cup Recipe.shaped(ActuallyItems.EMPTY_CUP.get()) .pattern("S S", "SCS", "SSS") diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java index 734783e4a..01ba74d67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java @@ -19,6 +19,7 @@ import de.ellpeck.actuallyadditions.mod.data.WorldData; import de.ellpeck.actuallyadditions.mod.inventory.gui.EnergyDisplay; import de.ellpeck.actuallyadditions.mod.tile.IEnergyDisplay; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -37,6 +38,7 @@ import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.client.event.RenderGuiOverlayEvent; +import net.neoforged.neoforge.client.event.RenderLevelStageEvent; import net.neoforged.neoforge.client.gui.overlay.GuiOverlayManager; import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent; @@ -227,4 +229,11 @@ public class ClientEvents { } } +/* @SubscribeEvent //TODO someday move the laser rendering to a new system + public void onRenderStage(final RenderLevelStageEvent event) { + if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_SOLID_BLOCKS) { + AssetUtil.renderLaser(); + } + }*/ + } 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 ec5cb6613..1bd1925cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -40,8 +40,6 @@ public final class ActuallyItems { // MISC ITEMS public static final DeferredItem CANOLA = ITEMS.register("canola", () -> new ItemBase()); public static final DeferredItem COFFEE_CUP = ITEMS.register("coffee_cup", () -> new ItemCoffee()); - public static final DeferredItem PAPER_CONE = ITEMS.register("paper_cone", () -> new ItemBase()); - public static final DeferredItem DOUGH = ITEMS.register("dough", () -> new ItemBase()); public static final DeferredItem RING = ITEMS.register("ring", () -> new ItemBase()); public static final DeferredItem BASIC_COIL = ITEMS.register("basic_coil", () -> new ItemBase()); public static final DeferredItem ADVANCED_COIL = ITEMS.register("advanced_coil", () -> new ItemBase()); @@ -192,7 +190,7 @@ public final class ActuallyItems { // The rest? RESTONIA_CRYSTAL_SHARD, PALIS_CRYSTAL_SHARD, DIAMATINE_CRYSTAL_SHARD, VOID_CRYSTAL_SHARD, EMERADIC_CRYSTAL_SHARD, ENORI_CRYSTAL_SHARD, ENGINEERS_GOGGLES, ENGINEERS_GOGGLES_ADVANCED, LASER_UPGRADE_RANGE, LASER_UPGRADE_INVISIBILITY, - HANDHELD_FILLER, TRAVELERS_SACK, VOID_SACK, PLAYER_PROBE, FILTER, WATER_BOWL, PAPER_CONE, DOUGH, + HANDHELD_FILLER, TRAVELERS_SACK, VOID_SACK, PLAYER_PROBE, FILTER, WATER_BOWL, RING, BASIC_COIL, ADVANCED_COIL, RICE_DOUGH, TINY_COAL, TINY_CHARCOAL, RICE_SLIMEBALL, CANOLA, EMPTY_CUP, BATS_WING, DRILL_CORE, LENS, ENDER_STAR, CRYSTALLIZED_CANOLA_SEED, EMPOWERED_CANOLA_SEED, LENS_OF_COLOR, LENS_OF_DETONATION, LENS_OF_CERTAIN_DEATH, LENS_OF_THE_KILLER, LENS_OF_DISENCHANTING, LENS_OF_THE_MINER, diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java index cc130cca3..158dd2921 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java @@ -61,7 +61,5 @@ public enum TheFoods { SPAGHETTI.returnItem = new ItemStack(Items.BOWL); PUMPKIN_STEW.returnItem = new ItemStack(Items.BOWL); CARROT_JUICE.returnItem = new ItemStack(Items.GLASS_BOTTLE); - FRENCH_FRIES.returnItem = new ItemStack(ActuallyItems.PAPER_CONE.get()); - FISH_N_CHIPS.returnItem = new ItemStack(ActuallyItems.PAPER_CONE.get()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/YummyItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/YummyItem.java index c85444e2a..02fa017cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/YummyItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/YummyItem.java @@ -20,8 +20,6 @@ public class YummyItem extends ActuallyItem { CHEESE(new FoodProperties.Builder().nutrition(1).saturationMod(0.05F), 3), PUMPKIN_STEW(new FoodProperties.Builder().nutrition(6).saturationMod(0.3F), 30, true, new ItemStack(Items.BOWL)), CARROT_JUICE(new FoodProperties.Builder().nutrition(4).saturationMod(0.2F), 20, true, new ItemStack(Items.GLASS_BOTTLE)), - FISH_N_CHIPS(new FoodProperties.Builder().nutrition(14).saturationMod(0.65F), 40, new ItemStack(ActuallyItems.PAPER_CONE.get())), - FRENCH_FRIES(new FoodProperties.Builder().nutrition(10).saturationMod(0.6F), 32, new ItemStack(ActuallyItems.PAPER_CONE.get())), FRENCH_FRY(new FoodProperties.Builder().nutrition(2).saturationMod(0.025F), 3), SPAGHETTI(new FoodProperties.Builder().nutrition(7).saturationMod(0.4F), 38, new ItemStack(Items.BOWL)), NOODLE(new FoodProperties.Builder().nutrition(1).saturationMod(0.01F), 3), diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 39c9412c6..f8fe672ad 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -279,8 +279,8 @@ "item.actuallyadditions.rice_dough": "Rice Dough (wip)", "item.actuallyadditions.food_rice_bread": "Rice Bread (wip)", "item.actuallyadditions.rice_seeds": "Rice Seeds", - "item.actuallyadditions.tiny_coal": "Tiny Coal (wip)", - "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal (wip)", + "item.actuallyadditions.tiny_coal": "Tiny Coal", + "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal", "item.actuallyadditions.rice_slimeball": "Rice Slimeball (wip)", "item.actuallyadditions.single_battery": "Single Battery", "item.actuallyadditions.double_battery": "Double Battery", @@ -377,7 +377,7 @@ "item.actuallyadditions.spawner_shard": "Spawner Shards (wip)", "item.actuallyadditions.minecart_firework_box": "Firework Box Cart (wip)", "item.actuallyadditions.water_bowl": "Bowl of Water (wip)", - "item.actuallyadditions.filter": "Item Filter (wip)", + "item.actuallyadditions.filter": "Item Filter", "item.actuallyadditions.biomass": "Biomass (wip)", "item.actuallyadditions.biocoal": "Bio Coal (wip)", "item.actuallyadditions.player_probe": "Player Probe (wip)",