diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java deleted file mode 100644 index 8623fda8f..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file ("LensConversionRecipe.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.api.recipe; - -import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; -import de.ellpeck.actuallyadditions.api.lens.Lens; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.math.BlockPos; - -Mi@Deprecated -public class LensConversionRecipe { - - protected final Ingredient input; - protected final ItemStack output; - protected final int energy; - protected final Lens type; - - @Deprecated - public LensConversionRecipe(ItemStack input, ItemStack output, int energy, Lens type) { - this(Ingredient.of(input), output, energy, type); - } - - public LensConversionRecipe(Ingredient input, ItemStack output, int energy, Lens type) { - this.input = input; - this.output = output; - this.energy = energy; - this.type = type; - } - - public boolean matches(ItemStack input, Lens lens) { - return this.input.test(input) && this.type == lens; - } - - public Ingredient getInput() { - return this.input; - } - - public ItemStack getOutput() { - return this.output; - } - - public int getEnergyUsed() { - return this.energy; - } - - public Lens getType() { - return this.type; - } - - public void transformHook(ItemStack stack, BlockState state, BlockPos pos, IAtomicReconstructor tile) { - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ReconstructorRenderer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ReconstructorRenderer.java index e86b21708..da0fc3b89 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ReconstructorRenderer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ReconstructorRenderer.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; @@ -41,6 +42,7 @@ public class ReconstructorRenderer extends TileEntityRenderer 0) { - AssetUtil.renderLaser(matrices, buffer, 0, 0, 0, rot, pitch, 5, 0, color, 0.8f * tile.getProgress(), 0.2f); + AssetUtil.renderLaser(matrices, buffer, 0, 0, 0, rot, pitch, length, 0, color, 0.8f * tile.getProgress(), 0.2f); tile.decTTL(); } if (stack.isEmpty() || !(stack.getItem() instanceof ILensItem)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EnchBookConversion.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EnchBookConversion.java deleted file mode 100644 index 0aeb87774..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EnchBookConversion.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.ellpeck.actuallyadditions.mod.recipe; - -import com.google.common.collect.ImmutableMap; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; -import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.math.BlockPos; - -import java.util.Map; - -// TODO: [port][test] check that this works -public class EnchBookConversion extends LensConversionRecipe { - - public EnchBookConversion() { - super(Ingredient.of(Items.ENCHANTED_BOOK), ItemStack.EMPTY, 155000, ActuallyAdditionsAPI.lensDefaultConversion); - } - - @Override - public void transformHook(ItemStack stack, BlockState state, BlockPos pos, IAtomicReconstructor tile) { - for (Map.Entry e : EnchantmentHelper.getEnchantments(stack).entrySet()) { - ItemStack book = new ItemStack(Items.ENCHANTED_BOOK); - Map ench = ImmutableMap.of(e.getKey(), e.getValue()); - EnchantmentHelper.setEnchantments(ench, book); - Block.popResource(tile.getWorldObject(), pos, book); - } - } - -}