From e0c2bfe9c487bb7c1d73a6a534c84c16c7afb479 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Mon, 11 Apr 2022 15:49:01 -0500 Subject: [PATCH] Removed disruption lens. added Ell's checklist. --- port.MD | 95 +++++++++++++++++++ .../mod/items/lens/LensDisruption.java | 94 ------------------ .../mod/items/lens/Lenses.java | 1 - 3 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 port.MD delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java diff --git a/port.MD b/port.MD new file mode 100644 index 000000000..9b1382bc8 --- /dev/null +++ b/port.MD @@ -0,0 +1,95 @@ +# Remove +- [ ] Lush caves +- [x] 11 lens (lens of disruption) +- [ ] Smiley cloud +- [ ] Occasional solidified XP drop from mobs +- [ ] Treasure chests +- [ ] Composter and bio-mash, biomass, bio coal and fertilizer +- [ ] Charcoal blocks +- [ ] Ender pearl blocks +- [ ] ESDs +- [ ] Fishing nets +- [ ] Solar panels +- [ ] Item repairers +- [ ] Knife (food can just be crafted normally) +- [ ] 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 +- [ ] Ring of liquid banning +- [ ] Emerald and obsidian armor and tools +- [ ] Black quartz armor and tools +- [ ] Crystal armor and tools (why did I ever make this) +- [ ] Resonant rice (this was an in-joke a long time ago) +- [ ] Jam villager and jams +- [ ] Potion rings +- [ ] Fur balls +- [ ] The food (except for stuff used elsewhere like the coffee) +- [ ] The weird rainbow colored item names, except for the crystals which should keep their color-matching names + +# Change +- [ ] Make crystal clusters spawn in amethyst nodes in 1.18, leave unused in 1.16 (same with crystal shards) +- [ ] Possibly make the bio reactor generate more CF, but with the same mechanics +- [ ] Improve the UI of the firework box (it's missing the gradient background, and it should also have a texture) +- [ ] Make fluid laser relays have a reasonable cap (maybe 2048mb per tick or something? Possibly check other mods for reference) +- [ ] 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" +- [ ] Make coal generator create half as much CF, we don't want this to be a main power source for people +- [ ] 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 + - [ ] Mid-tier can hold 16384 of two items + - [ ] Highest tier can hold 32768 of four items +- [ ] 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 +- [ ] Give ender star an enchantment glint +- [ ] Make miner lens far more expensive to use, mmm power creep +- [ ] Make coffee beans and seeds be the same item or I might get killed by someone finally + +# Keep As Is +- [ ] Battery box +- [ ] Item interfaces and item laser system +- [ ] Farmer +- [x] Empowerer and display stands +- [ ] Tiny torch +- [ ] Shock absorber +- [ ] Player interface +- [ ] Vertical digger +- [ ] Atomic reconstructor +- [ ] Ranged collector +- [ ] Breakers, placers and long-range breakers, as well as fluid variants +- [ ] Leaf-eating generator +- [ ] Lamps and lamp controller +- [ ] Lava factory controller +- [ ] The entire canola system +- [ ] Phantomfaces and their variants +- [ ] Feeder +- [ ] Crusher and double crusher +- [ ] Heat collectors +- [ ] Precision dropper +- [ ] Engineer's goggles +- [ ] Laser relay modifiers and wrench +- [ ] Handheld filler +- [ ] Sacks +- [ ] Player probe +- [ ] Item filter +- [ ] Water bowl +- [ ] Tiny coal and charcoal +- [ ] Rice slimeballs +- [ ] Storage crate keeper +- [ ] Color, detonation, certain death, killer and disenchanting lenses +- [ ] Storage crate upgrades, except for the "chest to storage crate" one +- [ ] Ring of growth +- [ ] Ring of magnetization +- [x] Teleport staff +- [ ] Wings of the Bats and wing items dropped from bats +- [ ] Drills and drill upgrades +- [ ] Batteries +- [ ] Crafting table on a stick +- [ ] Leaf blowers +- [ ] The book +- [x] The Crystal Flux name and rainbow effect +- [ ] Engineer's village house and engineer villager \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java deleted file mode 100644 index 9d4c32d87..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * This file ("LensDisruption.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.items.lens; - -import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; -import de.ellpeck.actuallyadditions.api.lens.Lens; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.config.CommonConfig; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.ArrayList; -import java.util.Random; - - -public class LensDisruption extends Lens { - - private static final int ENERGY_USE = 150000; - - @Override - public boolean invoke(BlockState hitState, BlockPos hitBlock, IAtomicReconstructor tile) { - if (CommonConfig.Other.ELEVEN.get() == 11 && tile.getEnergy() >= ENERGY_USE && hitBlock != null && !hitState.getBlock().isAir(hitState, tile.getWorldObject(), hitBlock)) { - int range = 2; - ArrayList items = (ArrayList) tile.getWorldObject().getEntitiesOfClass(ItemEntity.class, new AxisAlignedBB(hitBlock.getX() - range, hitBlock.getY() - range, hitBlock.getZ() - range, hitBlock.getX() + range, hitBlock.getY() + range, hitBlock.getZ() + range)); - for (ItemEntity item : items) { - ItemStack stack = item.getItem(); - if (item.isAlive() && StackUtil.isValid(stack)) { - if (!stack.hasTag() || !stack.getOrCreateTag().getBoolean(ActuallyAdditions.MODID + "DisruptedAlready")) { - - ItemStack newStack; - do { - if (tile.getWorldObject().random.nextBoolean()) { - newStack = this.getRandomItemFromRegistry(tile.getWorldObject().random);//new ItemStack(Item.REGISTRY.getRandomObject(tile.getWorldObject().rand)); - } else { - newStack = this.getRandomBlockFromRegistry(tile.getWorldObject().random);//new ItemStack(Block.REGISTRY.getRandomObject(tile.getWorldObject().rand)); - } - } while (!StackUtil.isValid(newStack)); - - newStack.setCount(stack.getCount()); - newStack.getOrCreateTag().putBoolean(ActuallyAdditions.MODID + "DisruptedAlready", true); - - item.remove(); - - ItemEntity newItem = new ItemEntity(tile.getWorldObject(), item.getX(), item.getY(), item.getZ(), newStack); - tile.getWorldObject().addFreshEntity(newItem); - - tile.extractEnergy(ENERGY_USE); - } - } - } - return true; - } - return false; - } - - @Override - public float[] getColor() { - return new float[]{246F / 255F, 255F / 255F, 183F / 255F}; - } - - @Override - public int getDistance() { - return 3; - } - - @Override - public boolean canInvoke(IAtomicReconstructor tile, Direction sideToShootTo, int energyUsePerShot) { - return tile.getEnergy() - energyUsePerShot >= ENERGY_USE; - } - - private ItemStack getRandomItemFromRegistry(Random random) { - return new ItemStack((Item) ForgeRegistries.ITEMS.getValues().toArray()[random.nextInt(ForgeRegistries.ITEMS.getValues().size())]); - } - - private ItemStack getRandomBlockFromRegistry(Random random) { - return new ItemStack((Block) ForgeRegistries.BLOCKS.getValues().toArray()[random.nextInt(ForgeRegistries.BLOCKS.getValues().size())]); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java index ddff275f9..87dd1cae6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java @@ -21,7 +21,6 @@ public final class Lenses { ActuallyAdditionsAPI.lensDeath = new LensDeath(); ActuallyAdditionsAPI.lensEvenMoarDeath = new LensKiller(); ActuallyAdditionsAPI.lensColor = new LensColor(); - ActuallyAdditionsAPI.lensDisruption = new LensDisruption(); ActuallyAdditionsAPI.lensDisenchanting = new LensDisenchanting(); ActuallyAdditionsAPI.lensMining = new LensMining(); }