mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 20:52:22 +00:00
Fix mutation multiplier and add gui mutation tooltip to accepted items
This commit is contained in:
1 parent
e851fb5bc8
commit
5ecfb694c5
3 files changed
+37
-25
No files matched your search
@@ -8,13 +8,13 @@ import binnie.craftgui.core.Tooltip;
|
||||
import binnie.craftgui.core.geometry.IPoint;
|
||||
import binnie.craftgui.core.renderer.RenderUtil;
|
||||
import binnie.craftgui.minecraft.Window;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.lwjgl.opencl.CL;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class ControlItemDisplay extends Control implements ITooltip {
|
||||
private ItemStack itemStack;
|
||||
@@ -82,7 +82,10 @@ public class ControlItemDisplay extends Control implements ITooltip {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getTooltip(final Tooltip tooltip) {
|
||||
if (this.hastooltip && !this.itemStack.isEmpty()) {
|
||||
tooltip.add(this.itemStack.getTooltip(((Window) this.getTopParent()).getPlayer(), false));
|
||||
final boolean advancedItemTooltips = Minecraft.getMinecraft().gameSettings.advancedItemTooltips;
|
||||
List<String> itemStackTooltip = this.itemStack.getTooltip(((Window) this.getTopParent()).getPlayer(), advancedItemTooltips);
|
||||
tooltip.add(itemStackTooltip);
|
||||
tooltip.setItemStack(this.itemStack);
|
||||
}
|
||||
super.getTooltip(tooltip);
|
||||
}
|
||||
|
||||
@@ -14,26 +14,28 @@ import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeListener;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
public class AlvearyMutator {
|
||||
public static int slotMutator = 0;
|
||||
static Map<ItemStack, Float> mutations = new HashMap<>();
|
||||
private static final List<Pair<ItemStack, Float>> MUTATIONS = new ArrayList<>();
|
||||
|
||||
public static boolean isMutationItem(final ItemStack item) {
|
||||
return getMutationMult(item) > 0.0f;
|
||||
}
|
||||
|
||||
public static float getMutationMult(final ItemStack item) {
|
||||
if (item.isEmpty()) {
|
||||
return 1.0f;
|
||||
}
|
||||
for (final ItemStack comp : AlvearyMutator.mutations.keySet()) {
|
||||
if (ItemStack.areItemStackTagsEqual(item, comp) && item.isItemEqual(comp)) {
|
||||
return AlvearyMutator.mutations.get(comp);
|
||||
if (!item.isEmpty()) {
|
||||
for (final Pair<ItemStack, Float> comp : AlvearyMutator.MUTATIONS) {
|
||||
ItemStack key = comp.getKey();
|
||||
if (item.isItemEqual(key) && ItemStack.areItemStackTagsEqual(item, key)) {
|
||||
return comp.getValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
return 1.0f;
|
||||
@@ -43,11 +45,12 @@ public class AlvearyMutator {
|
||||
if (item.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
AlvearyMutator.mutations.put(item, chance);
|
||||
AlvearyMutator.MUTATIONS.add(Pair.of(item, chance));
|
||||
AlvearyMutator.MUTATIONS.sort(Comparator.comparing(Pair::getValue));
|
||||
}
|
||||
|
||||
public static Collection<ItemStack> getMutagens() {
|
||||
return AlvearyMutator.mutations.keySet();
|
||||
public static List<Pair<ItemStack, Float>> getMutagens() {
|
||||
return Collections.unmodifiableList(AlvearyMutator.MUTATIONS);
|
||||
}
|
||||
|
||||
public static class PackageAlvearyMutator extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
|
||||
@@ -87,11 +90,9 @@ public class AlvearyMutator {
|
||||
|
||||
@Override
|
||||
public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) {
|
||||
if (this.getUtil().isSlotEmpty(AlvearyMutator.slotMutator)) {
|
||||
return 1.0f;
|
||||
}
|
||||
final float mult = AlvearyMutator.getMutationMult(this.getUtil().getStack(AlvearyMutator.slotMutator));
|
||||
return Math.min(mult, 15.0f / currentModifier);
|
||||
ItemStack mutator = this.getUtil().getStack(AlvearyMutator.slotMutator);
|
||||
final float mult = AlvearyMutator.getMutationMult(mutator);
|
||||
return Math.min(mult * currentModifier, 15f);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package binnie.extrabees.gui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.TileEntityMachine;
|
||||
import binnie.craftgui.controls.ControlText;
|
||||
import binnie.craftgui.core.geometry.IArea;
|
||||
import binnie.craftgui.core.geometry.TextJustification;
|
||||
@@ -15,9 +13,14 @@ import binnie.extrabees.apiary.machine.AlvearyMutator;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.NumberFormat;
|
||||
|
||||
public class WindowAlvearyMutator extends Window {
|
||||
public WindowAlvearyMutator(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
@@ -40,12 +43,17 @@ public class WindowAlvearyMutator extends Window {
|
||||
new ControlText(this, new IArea(0, 52, this.w(), 16), "Possible Mutagens:", TextJustification.MiddleCenter).setColour(5592405);
|
||||
final int size = AlvearyMutator.getMutagens().size();
|
||||
final int w = size * 18;
|
||||
NumberFormat numberFormat = DecimalFormat.getNumberInstance(MinecraftForgeClient.getLocale());
|
||||
if (size > 0) {
|
||||
int x = (this.w() - w) / 2;
|
||||
for (final ItemStack stack : AlvearyMutator.getMutagens()) {
|
||||
for (final Pair<ItemStack, Float> mutagen : AlvearyMutator.getMutagens()) {
|
||||
final ControlItemDisplay display = new ControlItemDisplay(this, x, 66);
|
||||
display.setItemStack(stack);
|
||||
display.setItemStack(mutagen.getKey());
|
||||
display.hastooltip = true;
|
||||
Float multiplier = mutagen.getValue();
|
||||
|
||||
String format = numberFormat.format(multiplier);
|
||||
display.addTooltip(TextFormatting.GRAY + "Multiplier: " + format + "x");
|
||||
x += 18;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user