diff --git a/port.MD b/port.MD index 1cf82df3c..f1dc9b119 100644 --- a/port.MD +++ b/port.MD @@ -10,9 +10,9 @@ - [x] ESDs - [ ] Fishing nets - [ ] Solar panels -- [ ] Item repairers +- [X] Item repairers - [x] Knife (food can just be crafted normally) -- [ ] Black lotuses and black dye +- [X] Black lotuses and black dye - [ ] Chest to storage crate upgrade (makes little sense with the way they are being changed), keep the other ones though - [x] Ring of liquid banning - [x] Emerald and obsidian armor and tools diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 55b4d0d1e..5b00198e7 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -576,6 +576,7 @@ f44b900f61f7210d15533c2e757395c3d767e21b data/actuallyadditions/loot_tables/bloc 069aca316e282ab12ad8ddbcfa3c389f1a13d673 data/actuallyadditions/loot_tables/blocks/wood_casing.json 218c99fd547620a1e6ee186d427dca486212eae0 data/actuallyadditions/loot_tables/blocks/xp_solidifier.json 64711e28d6fb7579f1ba2fed4a46440e213a2fac data/actuallyadditions/recipes/advanced_coil.json +d2666ce077d5892a3bffde70ddf53492ec876900 data/actuallyadditions/recipes/advanced_leaf_blower.json a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json 3d899eb727ee209cce77eae52985ea8ed1fc2455 data/actuallyadditions/recipes/basic_coil.json a4b4ff66a1d3387791b1bd72e461cdc62558a054 data/actuallyadditions/recipes/battery_box.json @@ -720,6 +721,7 @@ e088aee52db067c15c72bfe743ac106b98ca4be2 data/actuallyadditions/recipes/colorcha 11ddd815c96912369ee0d96fe719d5958370ed3c data/actuallyadditions/recipes/colorchange/yellow_stained_glass_pane.json a4fb51f83c38bfebceeadde885d59632e355bf6d data/actuallyadditions/recipes/colorchange/yellow_terracotta.json ca4f8d37d115eac5889542b04d1c01cd2e0cde43 data/actuallyadditions/recipes/colorchange/yellow_wool.json +6a7cf2e5eb1fd134328a182b8001fdf0e622c94a data/actuallyadditions/recipes/crafter_on_a_stick.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json 341c5816febc417a36e516986f6d1461cf38cfed data/actuallyadditions/recipes/crushing/bone_crusher.json 293cecfa94d22e62bd817a3964e82dca4479d44d data/actuallyadditions/recipes/diamond_aiot.json @@ -750,6 +752,7 @@ db1b6e924352a7e097a5675bbf2a27888c6cbded data/actuallyadditions/recipes/empoweri 1b59c946f4cfbfc9bc3a2e7562105cd3a0d09d69 data/actuallyadditions/recipes/empowering/restonia_block.json 74a9dc2b89805e5c232fa66da8db8e96af0b0703 data/actuallyadditions/recipes/empowering/void.json d112aa7267600c2a55f5efb617cb574aaa56502e data/actuallyadditions/recipes/empowering/void_block.json +d7205e0d7796bdcdf7280117c821ec5c6c6d8fee data/actuallyadditions/recipes/empty_cup.json 7306e280d2cb9ef47fe1cf43a2a289752a09a488 data/actuallyadditions/recipes/ender_casing.json 3ade772cd50a533137dc1d27a2b060b85e525d8a data/actuallyadditions/recipes/engineers_goggles.json f2c63622c99c5ff552e5ce408956d3fe40582e43 data/actuallyadditions/recipes/engineers_goggles_advanced.json @@ -822,13 +825,16 @@ a37d681793afbdafb245885ab96713ce3cba988d data/actuallyadditions/recipes/miningle ccdc4ab92dc7c0aae4de1566435ef5d701e14934 data/actuallyadditions/recipes/mininglens/stone_lapis_ore.json 7d99d73a12a25056891a68a73cc4b93ce622e46a data/actuallyadditions/recipes/mininglens/stone_redstone_ore.json 7821b149dc37caa85b587a0276307f1b5cefaa03 data/actuallyadditions/recipes/netherite_aiot.json -4590b472dcb90700ea525a3c6ac3f325458fab19 data/actuallyadditions/recipes/phantom_connector.json +4590b472dcb90700ea525a3c6ac3f325458fab19 data/actuallyadditions/recipes/phantom_clearing.json +2fbfcfa1d6330b9585a1eb1ffd4bedaf67754120 data/actuallyadditions/recipes/phantom_connector.json +68e330f212e20f2d0b46190d06d8f4ae3b0e6271 data/actuallyadditions/recipes/player_probe.json 6a1050a9aaadea6d3961b7e77ee17880404a56e0 data/actuallyadditions/recipes/pressing/canola.json 68e7d4bd5e6ea852ef57ff5032d922a9a703fd77 data/actuallyadditions/recipes/quadruple_battery.json 6797b2f74af9eb67a8ea6bdfa198cab7052db2a0 data/actuallyadditions/recipes/quintuple_battery.json 70fc9365035ac3642771f921513990c88618de8f data/actuallyadditions/recipes/rice_seeds.json 5b104e2c32eafdf802743d0e8d4c1a7e14071668 data/actuallyadditions/recipes/rice_slime.json 85d2537a973d520c9eaaf2f15109c265faa2df3a data/actuallyadditions/recipes/rice_slime_potion.json +77a4b16cceff940cbf18b49fab9a97d4aa8eef7d data/actuallyadditions/recipes/ring_of_growth.json 469f920b7b32f5d29c435cb73cec09776c882c3d data/actuallyadditions/recipes/ring_of_magnetizing.json d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json 655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json b/src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json new file mode 100644 index 000000000..3e46c3592 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " F", + "DP", + "DC" + ], + "key": { + "F": { + "item": "minecraft:flint" + }, + "D": { + "item": "actuallyadditions:diamatine_crystal" + }, + "P": { + "item": "minecraft:piston" + }, + "C": { + "item": "actuallyadditions:advanced_coil" + } + }, + "result": { + "item": "actuallyadditions:advanced_leaf_blower" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/crafter_on_a_stick.json b/src/generated/resources/data/actuallyadditions/recipes/crafter_on_a_stick.json new file mode 100644 index 000000000..18a1ac56e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/crafter_on_a_stick.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:crafting_table" + }, + { + "tag": "minecraft:signs" + } + ], + "result": { + "item": "actuallyadditions:crafter_on_a_stick" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/empty_cup.json b/src/generated/resources/data/actuallyadditions/recipes/empty_cup.json new file mode 100644 index 000000000..0e464d6b7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/empty_cup.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SCS", + "SSS" + ], + "key": { + "S": { + "tag": "forge:stone" + }, + "C": { + "item": "actuallyadditions:coffee_beans" + } + }, + "result": { + "item": "actuallyadditions:empty_cup" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/phantom_clearing.json b/src/generated/resources/data/actuallyadditions/recipes/phantom_clearing.json new file mode 100644 index 000000000..331dcf89a --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/phantom_clearing.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:phantom_connector" + } + ], + "result": { + "item": "actuallyadditions:phantom_connector" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/phantom_connector.json b/src/generated/resources/data/actuallyadditions/recipes/phantom_connector.json index 331dcf89a..b989a70bf 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/phantom_connector.json +++ b/src/generated/resources/data/actuallyadditions/recipes/phantom_connector.json @@ -1,10 +1,21 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:phantom_connector" - } + "type": "minecraft:crafting_shaped", + "pattern": [ + "YE", + "EY", + "S " ], + "key": { + "Y": { + "item": "minecraft:ender_eye" + }, + "E": { + "tag": "forge:ender_pearls" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, "result": { "item": "actuallyadditions:phantom_connector" } diff --git a/src/generated/resources/data/actuallyadditions/recipes/player_probe.json b/src/generated/resources/data/actuallyadditions/recipes/player_probe.json new file mode 100644 index 000000000..129870c34 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/player_probe.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A A", + "AIA", + "RHR" + ], + "key": { + "A": { + "item": "minecraft:iron_bars" + }, + "R": { + "item": "actuallyadditions:empowered_restonia_crystal" + }, + "H": { + "item": "minecraft:wither_skeleton_skull" + }, + "I": { + "item": "minecraft:iron_helmet" + } + }, + "result": { + "item": "actuallyadditions:player_probe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json b/src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json new file mode 100644 index 000000000..6ef62e6a1 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SIS", + "IOI", + "SIS" + ], + "key": { + "S": { + "tag": "forge:seeds" + }, + "I": { + "item": "actuallyadditions:empowered_enori_crystal" + }, + "O": { + "item": "actuallyadditions:ring" + } + }, + "result": { + "item": "actuallyadditions:ring_of_growth" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index bcfd64bf7..c8376991e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -113,7 +113,7 @@ public class ItemRecipeGenerator extends RecipeProvider { //Clearing NBT Storage Recipe.shapeless(ActuallyItems.LASER_WRENCH.get()).ingredients(ActuallyItems.LASER_WRENCH.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "laser_wrench_nbt")).save(consumer); - Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).save(consumer); + Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "phantom_clearing")).save(consumer); //Disenchanting Lens Recipe.shapeless(ActuallyItems.LENS_OF_DISENCHANTING.get()) @@ -206,6 +206,14 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('F', Items.FLINT) .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); + //Advanced Leaf Blower + Recipe.shaped(ActuallyItems.ADVANCED_LEAF_BLOWER.get()).pattern(" F", "DP", "DC") + .define('F', Items.FLINT) + .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) + .define('P', Items.PISTON) + .define('C', ActuallyItems.ADVANCED_COIL.get()) + .save(consumer); + //Drill //TODO the rest of the coloring recipes Recipe.shaped(ActuallyItems.DRILL_MAIN.get()) .pattern("DDD") @@ -401,12 +409,16 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('O', ActuallyItems.RING.get()) .save(consumer); + //Growth Ring + Recipe.shaped(ActuallyItems.RING_OF_GROWTH.get()) + .pattern("SIS", "IOI", "SIS") + .define('S', Tags.Items.SEEDS) + .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) + .define('O', ActuallyItems.RING.get()) + .save(consumer); + Recipe.shapeless(ActuallyItems.CRAFTER_ON_A_STICK.get()).requires(Items.CRAFTING_TABLE).requires(ItemTags.SIGNS).save(consumer); - - - - ConditionalRecipe.builder() .addCondition(new BoolConfigCondition("tinyCoalStuff")) .addRecipe( @@ -443,33 +455,32 @@ public class ItemRecipeGenerator extends RecipeProvider { .requires(ActuallyItems.RICE.get()) .save(consumer); + //Cup + Recipe.shaped(ActuallyItems.EMPTY_CUP.get()) + .pattern("S S", "SCS", "SSS") + .define('S', Tags.Items.STONE) + .define('C', ActuallyItems.COFFEE_BEANS.get()) + .save(consumer); + //Phantom Connector + Recipe.shaped(ActuallyItems.PHANTOM_CONNECTOR.get()) + .pattern("YE", "EY", "S ") + .define('Y', Items.ENDER_EYE) + .define('E', Tags.Items.ENDER_PEARLS) + .define('S', Tags.Items.RODS_WOODEN) + .save(consumer); + + //Player Probe + Recipe.shaped(ActuallyItems.PLAYER_PROBE.get()) + .pattern("A A", "AIA", "RHR") + .define('A', Items.IRON_BARS) + .define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get()) + .define('H', Items.WITHER_SKELETON_SKULL) + .define('I', Items.IRON_HELMET) + .save(consumer); - // //Growth Ring - // RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemGrowthRing), "SIS", "IOI", "SIS", 'S', new ItemStack(Items.WHEAT_SEEDS), 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())); - // recipeGrowthRing = RecipeUtil.lastIRecipe(); - // - // //Cup - // RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()), "S S", "SCS", "SSS", 'S', "stone", 'C', "cropCoffee"); - // recipeCup = RecipeUtil.lastIRecipe(); - // //Advanced Leaf Blower - // RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemLeafBlowerAdvanced), " F", "DP", "DC", 'F', new ItemStack(Items.FLINT), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'P', new ItemStack(Blocks.PISTON), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())); - // recipeLeafBlowerAdvanced = RecipeUtil.lastIRecipe(); - // - // //Phantom Connector - // RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemPhantomConnector), "YE", "EY", "S ", 'Y', Items.ENDER_EYE, 'E', Items.ENDER_PEARL, 'S', "stickWood"); - // recipePhantomConnector = RecipeUtil.lastIRecipe(); - // - // //Player Probe - // RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemPlayerProbe), "A A", "AIA", "RHR", 'A', new ItemStack(Blocks.IRON_BARS), 'R', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'H', new ItemStack(Items.SKULL, 1, 1), 'I', new ItemStack(Items.IRON_HELMET)); - // recipePlayerProbe = RecipeUtil.lastIRecipe(); - // // //Quartz // GameRegistry.addSmelting(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), 1F); - // - // //Knife - // RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitItems.itemKnife), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal())); - // recipeKnife = RecipeUtil.lastIRecipe(); // //Ingots from Dusts // GameRegistry.addSmelting(new ItemStack(InitItems.itemDust, 1, TheDusts.IRON.ordinal()), new ItemStack(Items.IRON_INGOT), 1F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java deleted file mode 100644 index d741904d9..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ /dev/null @@ -1,67 +0,0 @@ -// TODO: [port] no longer used -///* -// * This file ("BlockItemRepairer.java") is part of the Actually Additions mod for Minecraft. -// * It is created and owned by Ellpeck and distributed -// * under the Actually Additions License to be found at -// * http://ellpeck.de/actaddlicense -// * View the source code at https://github.com/Ellpeck/ActuallyAdditions -// * -// * © 2015-2017 Ellpeck -// */ -// -//package de.ellpeck.actuallyadditions.mod.blocks; -// -//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; -//import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; -//import net.minecraft.block.SoundType; -//import net.minecraft.block.material.Material; -//import net.minecraft.entity.player.PlayerEntity; -//import net.minecraft.item.EnumRarity; -//import net.minecraft.item.ItemStack; -//import net.minecraft.tileentity.TileEntity; -//import net.minecraft.util.Hand; -//import net.minecraft.util.math.BlockPos; -//import net.minecraft.world.IBlockAccess; -//import net.minecraft.world.World; -// -//public class BlockItemRepairer extends BlockContainerBase { -// -// public BlockItemRepairer() { -// super(Material.ROCK, this.name); -// this.setHarvestLevel("pickaxe", 0); -// this.setHardness(20.0F); -// this.setResistance(15.0F); -// this.setSoundType(SoundType.STONE); -// this.setTickRandomly(true); -// } -// -// @Override -// public TileEntity createNewTileEntity(IBlockReader worldIn) { -// return new TileEntityItemRepairer(); -// } -// -// @Override -// public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { -// if (!world.isRemote) { -// TileEntityItemRepairer repairer = (TileEntityItemRepairer) world.getTileEntity(pos); -// if (repairer != null) { -// player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.REPAIRER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); -// } -// return true; -// } -// return true; -// } -// -// @Override -// public int getLightValue(BlockState state, IBlockAccess world, BlockPos pos) { -// return this.getMetaFromState(state) == 1 -// ? 12 -// : 0; -// } -// -// @Override -// public EnumRarity getRarity(ItemStack stack) { -// return EnumRarity.EPIC; -// } -//}