Skip to content

Commit

Permalink
properly apply mineable tag
Browse files Browse the repository at this point in the history
  • Loading branch information
DonovanDMC committed Nov 20, 2022
1 parent 268bc8f commit 5a88b16
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cool.furry.mc.forge.projectexpansion.block;
package cool.furry.mc.forge.projectexpansion.item;

import cool.furry.mc.forge.projectexpansion.Main;
import cool.furry.mc.forge.projectexpansion.util.Fuel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context)

if (world.isClientSide || player == null) return ActionResultType.PASS;

TileEntity tile = world.getBlockEntity(pos);
TileEntity blockEntity = world.getBlockEntity(pos);
Block block = world.getBlockState(pos).getBlock();

Matter matter;
Expand Down Expand Up @@ -87,31 +87,31 @@ public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context)
@Nullable String ownerName = null;
@Nullable BigInteger emc = null;

if (tile instanceof TileCollector) {
if (blockEntity instanceof TileCollector) {
upgrade = Objects.requireNonNull(upgradeTo.getCollectorItem());
upgradeBlock = Objects.requireNonNull(upgradeTo.getCollector());
}

if (tile instanceof TilePowerFlower) {
TilePowerFlower tilePowerFlower = (TilePowerFlower) tile;
if (blockEntity instanceof TilePowerFlower) {
TilePowerFlower bePowerFlower = (TilePowerFlower) blockEntity;
upgrade = Objects.requireNonNull(upgradeTo.getPowerFlowerItem());
upgradeBlock = Objects.requireNonNull(upgradeTo.getPowerFlower());
owner = tilePowerFlower.owner;
ownerName = tilePowerFlower.ownerName;
emc = tilePowerFlower.emc;
owner = bePowerFlower.owner;
ownerName = bePowerFlower.ownerName;
emc = bePowerFlower.emc;
if (owner == null) return ActionResultType.FAIL;
if (owner != player.getUUID()) {
player.displayClientMessage(new TranslationTextComponent("item.projectexpansion.matter_upgrader.not_owner").setStyle(ColorStyle.RED), true);
return ActionResultType.FAIL;
}
}

if (tile instanceof TileRelay) {
if (blockEntity instanceof TileRelay) {
upgrade = Objects.requireNonNull(upgradeTo.getRelayItem());
upgradeBlock = Objects.requireNonNull(upgradeTo.getRelay());
}

if (tile instanceof TileEMCLink) {
if (blockEntity instanceof TileEMCLink) {
upgrade = Objects.requireNonNull(upgradeTo.getEMCLinkItem());
upgradeBlock = Objects.requireNonNull(upgradeTo.getEMCLink());
}
Expand All @@ -134,15 +134,15 @@ public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext context)
world.removeBlock(pos, false);
world.setBlockAndUpdate(pos, upgradeBlock.defaultBlockState());

if (tile instanceof TilePowerFlower) {
if (blockEntity instanceof TilePowerFlower) {
if (ownerName == null || emc == null) return ActionResultType.FAIL;

TilePowerFlower newTile = new TilePowerFlower();
newTile.owner = owner;
newTile.ownerName = ownerName;
newTile.emc = emc;
tile.save(new CompoundNBT());
Util.markDirty(tile);
blockEntity.save(new CompoundNBT());
Util.markDirty(blockEntity);
world.removeBlockEntity(pos);
world.setBlockEntity(pos, newTile);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cool.furry.mc.forge.projectexpansion.util;

import cool.furry.mc.forge.projectexpansion.block.BlockFuelItem;
import cool.furry.mc.forge.projectexpansion.item.BlockFuelItem;
import cool.furry.mc.forge.projectexpansion.registries.Blocks;
import cool.furry.mc.forge.projectexpansion.registries.Items;
import cool.furry.mc.forge.projectexpansion.item.ItemFuel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ public ITextComponent getEMCLinkEMCLimitComponent() {
private void register(RegistrationType reg) {
switch (reg) {
case MATTER: {
if (hasItem) itemMatter = Items.Registry.register(String.format("%s_matter", name), () -> new Item(new Item.Properties().tab(Main.tab).rarity(rarity)));
if (hasItem) {
itemMatter = Items.Registry.register(String.format("%s_matter", name), () -> new Item(new Item.Properties().tab(Main.tab).rarity(rarity)));
}
break;
}

Expand Down

0 comments on commit 5a88b16

Please sign in to comment.