Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-22 19:39:24 +01:00
Code Issues Projects Releases Wiki Activity

Drill optimizations.

Browse source 
Added drill upgrade list to the tooltip.
This commit is contained in:
Flanks255 2024-12-14 11:03:50 -06:00
parent d5757a1453
commit d84518feb8
4 changed files with 87 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -5,6 +5,8 @@
* Added crops block-tag to Canola/Flax/Rice * Added crops block-tag to Canola/Flax/Rice
* Fixed the drill block placement augment. * Fixed the drill block placement augment.
* Migrated the Coal generator to using any burnable item, Removed Solid fuel recipes. * Migrated the Coal generator to using any burnable item, Removed Solid fuel recipes.
* The Drill's now display a list of installed augments in tooltips.
* The Drill Placer upgrade now displays the selected slot in its tooltip, and on the drill when installed.
# 1.3.11+mc1.21.1 # 1.3.11+mc1.21.1
* Fixed Farmer not playing well with non-vanilla farmland. * Fixed Farmer not playing well with non-vanilla farmland.

8
src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java
View file

@ -292,8 +292,10 @@ public class ClientEvents {
return; return;
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
var upgrades = DrillItem.getUpgrades(stack);
if (stack.getItem() instanceof DrillItem drillItem) { if (stack.getItem() instanceof DrillItem drillItem) {
if (!player.isShiftKeyDown() && drillItem.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) { if (!player.isShiftKeyDown() && upgrades.contains(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) {
Level level = player.level(); Level level = player.level();
Vec3 vec3 = event.getCamera().getPosition(); Vec3 vec3 = event.getCamera().getPosition();
double d0 = vec3.x(); double d0 = vec3.x();
@ -305,9 +307,9 @@ public class ClientEvents {
VertexConsumer lineConsumer = event.getMultiBufferSource().getBuffer(RenderType.lines()); VertexConsumer lineConsumer = event.getMultiBufferSource().getBuffer(RenderType.lines());
if (stack.isCorrectToolForDrops(blockState)) { if (stack.isCorrectToolForDrops(blockState)) {
int radius = 0; int radius = 0;
if (drillItem.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) {
radius = 2; radius = 2;
} else if (drillItem.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) { } else if (upgrades.contains(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) {
radius = 1; radius = 1;
} }
if (radius == 0) return; //No radius, no need to render extra hitboxes if (radius == 0) return; //No radius, no need to render extra hitboxes

118
src/main/java/de/ellpeck/actuallyadditions/mod/items/DrillItem.java
View file

@ -162,6 +162,57 @@ public class DrillItem extends ItemEnergy {
return ItemStack.EMPTY; return ItemStack.EMPTY;
} }
/**
* Gets all of the Upgrades that are installed in the Drill
*
* @param drill The Drill
* @return A List of all Upgrades
*/
public static List<ItemDrillUpgrade.UpgradeType> getUpgrades(@Nonnull ItemStack drill) {
var contents = drill.getOrDefault(ActuallyComponents.CONTENTS, ItemContainerContents.EMPTY);
List<ItemDrillUpgrade.UpgradeType> upgrades = new ArrayList<>();
for (int i = 0; i < contents.getSlots(); i++) {
ItemStack slotStack = contents.getStackInSlot(i);
if (!slotStack.isEmpty() && slotStack.getItem() instanceof ItemDrillUpgrade drillUpgrade) {
upgrades.add(drillUpgrade.type);
}
}
return upgrades;
}
/**
* Gets all of the Upgrades that are installed in the Drill as a String
*
* @param drill The Drill
* @return A String of all Upgrades
*/
public static String getUpgradesString(@Nonnull ItemStack drill) {
List<ItemDrillUpgrade.UpgradeType> upgrades = getUpgrades(drill);
StringBuilder sb = new StringBuilder();
for (ItemDrillUpgrade.UpgradeType upgrade : upgrades) {
String name = switch (upgrade) {
case SPEED -> "Speed";
case SPEED_II -> "Speed II";
case SPEED_III -> "Speed III";
case SILK_TOUCH -> "Silk Touch";
case FORTUNE -> "Fortune";
case FORTUNE_II -> "Fortune II";
case THREE_BY_THREE -> "3x3";
case FIVE_BY_FIVE -> "5x5";
case PLACER -> "Placer";
};
sb.append(name).append(", ");
}
if (sb.length() > 2) {
sb.delete(sb.length() - 2, sb.length());
}
return sb.toString();
}
@Nonnull @Nonnull
@Override @Override
public InteractionResultHolder<ItemStack> use(Level world, @Nonnull Player player, @Nonnull InteractionHand hand) { public InteractionResultHolder<ItemStack> use(Level world, @Nonnull Player player, @Nonnull InteractionHand hand) {
@ -208,15 +259,17 @@ public class DrillItem extends ItemEnergy {
Level level = player.level(); Level level = player.level();
boolean toReturn = false; boolean toReturn = false;
int use = this.getEnergyUsePerBlock(stack); int use = this.getEnergyUsePerBlock(stack);
var upgrades = getUpgrades(stack);
if (getEnergyStored(stack) >= use) { if (getEnergyStored(stack) >= use) {
//Enchants the Drill depending on the Upgrades it has //Enchants the Drill depending on the Upgrades it has
if (getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SILK_TOUCH)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SILK_TOUCH)) {
ItemUtil.addEnchantment(stack, level.holderOrThrow(Enchantments.SILK_TOUCH), 1, level.registryAccess()); ItemUtil.addEnchantment(stack, level.holderOrThrow(Enchantments.SILK_TOUCH), 1, level.registryAccess());
} }
else { else {
if (getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FORTUNE)) {
ItemUtil.addEnchantment(stack, level.holderOrThrow(Enchantments.FORTUNE), ItemUtil.addEnchantment(stack, level.holderOrThrow(Enchantments.FORTUNE),
getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE_II) ? 3 : 1, upgrades.contains(ItemDrillUpgrade.UpgradeType.FORTUNE_II) ? 3 : 1,
level.registryAccess()); level.registryAccess());
} }
} }
@ -224,8 +277,8 @@ public class DrillItem extends ItemEnergy {
HitResult ray = player.pick(Util.getReachDistance(player), 1f, false); HitResult ray = player.pick(Util.getReachDistance(player), 1f, false);
if (ray instanceof BlockHitResult trace) { if (ray instanceof BlockHitResult trace) {
//Breaks the Blocks //Breaks the Blocks
if (!player.isShiftKeyDown() && getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) { if (!player.isShiftKeyDown() && upgrades.contains(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) {
if (getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) {
toReturn = breakBlocks(stack, 2, player.level(), pos, trace.getDirection(), player); toReturn = breakBlocks(stack, 2, player.level(), pos, trace.getDirection(), player);
} }
else { else {
@ -245,28 +298,8 @@ public class DrillItem extends ItemEnergy {
return toReturn; return toReturn;
} }
/* @Override //TODO old one
public boolean isCorrectToolForDrops(ItemStack stack, BlockState state) {
Block block = state.getBlock();
return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && (this.hasExtraWhitelist(block) || state.canBeReplaced() || block == Blocks.SNOW_BLOCK || block == Blocks.SNOW || (block == Blocks.OBSIDIAN
? HARVEST_LEVEL >= 3
: block != Blocks.DIAMOND_BLOCK && block != Blocks.DIAMOND_ORE
? block != Blocks.EMERALD_ORE && block != Blocks.EMERALD_BLOCK
? block != Blocks.GOLD_BLOCK && block != Blocks.GOLD_ORE
? block != Blocks.IRON_BLOCK && block != Blocks.IRON_ORE
? block != Blocks.LAPIS_BLOCK && block != Blocks.LAPIS_ORE
? block != Blocks.REDSTONE_ORE
? state.is(Tags.Blocks.STONE) || state.is(Tags.Blocks.STORAGE_BLOCKS)
: HARVEST_LEVEL >= 2
: HARVEST_LEVEL >= 1
: HARVEST_LEVEL >= 1
: HARVEST_LEVEL >= 2
: HARVEST_LEVEL >= 2
: HARVEST_LEVEL >= 2));
}*/
@Override @Override
public boolean isCorrectToolForDrops(ItemStack stack, BlockState state) { public boolean isCorrectToolForDrops(@Nonnull ItemStack stack, @Nonnull BlockState state) {
return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && super.isCorrectToolForDrops(stack, state); return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && super.isCorrectToolForDrops(stack, state);
} }
@ -278,35 +311,36 @@ public class DrillItem extends ItemEnergy {
*/ */
public int getEnergyUsePerBlock(ItemStack stack) { public int getEnergyUsePerBlock(ItemStack stack) {
int use = ENERGY_USE; int use = ENERGY_USE;
var upgrades = getUpgrades(stack);
//Speed //Speed
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SPEED)) {
use += 50; use += 50;
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_II)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SPEED_II)) {
use += 75; use += 75;
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_III)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SPEED_III)) {
use += 175; use += 175;
} }
} }
} }
//Silk Touch //Silk Touch
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SILK_TOUCH)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SILK_TOUCH)) {
use += 100; use += 100;
} }
//Fortune //Fortune
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FORTUNE)) {
use += 40; use += 40;
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE_II)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FORTUNE_II)) {
use += 80; use += 80;
} }
} }
//Size //Size
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) {
use += 10; use += 10;
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) {
use += 30; use += 30;
} }
} }
@ -333,9 +367,11 @@ public class DrillItem extends ItemEnergy {
*/ */
public float getEfficiencyFromUpgrade(ItemStack stack) { public float getEfficiencyFromUpgrade(ItemStack stack) {
float efficiency = 8.0F; float efficiency = 8.0F;
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED)) { var upgrades = getUpgrades(stack);
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_II)) {
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_III)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SPEED)) {
if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SPEED_II)) {
if (upgrades.contains(ItemDrillUpgrade.UpgradeType.SPEED_III)) {
efficiency += 37.0F; efficiency += 37.0F;
} else { } else {
efficiency += 25.0F; efficiency += 25.0F;
@ -344,9 +380,9 @@ public class DrillItem extends ItemEnergy {
efficiency += 8.0F; efficiency += 8.0F;
} }
} }
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)) {
efficiency *= 0.5F; efficiency *= 0.5F;
if (this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) { if (upgrades.contains(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)) {
efficiency *= 0.35F; efficiency *= 0.35F;
} }
} }
@ -545,6 +581,10 @@ public class DrillItem extends ItemEnergy {
@Override @Override
public void appendHoverText(@Nonnull ItemStack stack, @Nonnull TooltipContext context, @Nonnull List<Component> tooltip, @Nonnull TooltipFlag flagIn) { public void appendHoverText(@Nonnull ItemStack stack, @Nonnull TooltipContext context, @Nonnull List<Component> tooltip, @Nonnull TooltipFlag flagIn) {
super.appendHoverText(stack, context, tooltip, flagIn); super.appendHoverText(stack, context, tooltip, flagIn);
String augmentList = getUpgradesString(stack);
tooltip.add(Component.translatable("tooltip.actuallyadditions.drill.augments", augmentList).withStyle(ChatFormatting.GRAY));
ItemStack placer = this.getHasUpgradeAsStack(stack, ItemDrillUpgrade.UpgradeType.PLACER); ItemStack placer = this.getHasUpgradeAsStack(stack, ItemDrillUpgrade.UpgradeType.PLACER);
if (!placer.isEmpty()) { if (!placer.isEmpty()) {
tooltip.add(Component.translatable("tooltip.actuallyadditions.placer_augment", ItemDrillUpgrade.getSlotToPlaceFrom(placer) + 1).withStyle(ChatFormatting.GRAY)); tooltip.add(Component.translatable("tooltip.actuallyadditions.placer_augment", ItemDrillUpgrade.getSlotToPlaceFrom(placer) + 1).withStyle(ChatFormatting.GRAY));

1
src/main/resources/assets/actuallyadditions/lang/en_us.json
View file

@ -445,6 +445,7 @@
"tooltip.actuallyadditions.item_tag.no_tag": "Use Anvil to set tag.", "tooltip.actuallyadditions.item_tag.no_tag": "Use Anvil to set tag.",
"tooltip.actuallyadditions.coal_generator_stats": "Generates %d CF (%d CF/t for %d ticks)", "tooltip.actuallyadditions.coal_generator_stats": "Generates %d CF (%d CF/t for %d ticks)",
"tooltip.actuallyadditions.placer_augment": "Placing blocks from hotbar slot %d", "tooltip.actuallyadditions.placer_augment": "Placing blocks from hotbar slot %d",
"tooltip.actuallyadditions.drill.augments": "Installed Augments: %s",
"_comment": "Gui Information", "_comment": "Gui Information",
"info.actuallyadditions.gui.animals": "Animals", "info.actuallyadditions.gui.animals": "Animals",
"info.actuallyadditions.gui.enoughToBreed": "Enough to breed!", "info.actuallyadditions.gui.enoughToBreed": "Enough to breed!",