mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-17 19:15:13 +00:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c311d48500 | ||
|
|
03709d8efa | ||
|
|
0ce4118e36 | ||
|
|
8aea03c251 | ||
|
|
d451fe5aa8 | ||
|
|
d01fb80c54 | ||
|
|
a136fdd717 | ||
|
|
2afbe162e4 |
No files matched your search
@@ -14,36 +14,27 @@ public class AnimatedItemStack {
|
||||
private int lastPosX = -1;
|
||||
private int lastPosY = -1;
|
||||
private float currentScale = 0;
|
||||
private final boolean doMoveAnim;
|
||||
private final boolean doPopAnim;
|
||||
private boolean doPopAnim;
|
||||
|
||||
public ItemStack itemStack;
|
||||
|
||||
public AnimatedItemStack(ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
|
||||
public AnimatedItemStack(ItemStack itemStack, boolean doPopAnim) {
|
||||
this.itemStack = itemStack;
|
||||
this.doMoveAnim = doMoveAnim;
|
||||
this.doPopAnim = doPopAnim;
|
||||
}
|
||||
|
||||
public void drawItem(int x, int y) {
|
||||
drawItem(x, y, false, null, false);
|
||||
drawItem(x, y, false, null);
|
||||
}
|
||||
|
||||
public void drawItem(int x, int y, boolean smallAmount, String stackSize, boolean blockMoveAnimOnce) {
|
||||
if (NEIClientConfig.areBookmarksAnimated()) {
|
||||
if (doPopAnim && currentScale < 1) {
|
||||
drawPoppingItem(x, y, smallAmount, stackSize);
|
||||
return;
|
||||
}
|
||||
if (doMoveAnim && (lastPosX != x || lastPosY != y) && !blockMoveAnimOnce) {
|
||||
drawMovingItem(x, y, smallAmount, stackSize);
|
||||
return;
|
||||
}
|
||||
public void drawItem(int x, int y, boolean smallAmount, String stackSize) {
|
||||
if (doPopAnim && currentScale < 1) {
|
||||
drawPoppingItem(x, y, smallAmount, stackSize);
|
||||
} else if (lastPosX != x || lastPosY != y) {
|
||||
drawMovingItem(x, y, smallAmount, stackSize);
|
||||
} else {
|
||||
GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
|
||||
}
|
||||
currentScale = 1;
|
||||
lastPosX = x;
|
||||
lastPosY = y;
|
||||
GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
|
||||
}
|
||||
|
||||
private void drawPoppingItem(int x, int y, boolean smallAmount, String stackSize) {
|
||||
|
||||
@@ -222,24 +222,24 @@ public class BookmarkPanel extends PanelWidget {
|
||||
return metadata.get(idx);
|
||||
}
|
||||
|
||||
public void addItem(ItemStack stackA, BookmarkStackMeta meta, boolean doPopAnim) {
|
||||
addRealItem(stackA, true, doPopAnim);
|
||||
public void addItem(ItemStack stackA, BookmarkStackMeta meta) {
|
||||
addRealItem(stackA, true);
|
||||
metadata.add(meta);
|
||||
onGridChanged();
|
||||
}
|
||||
|
||||
public void addItem(ItemStack stackA, BookmarkStackMeta meta, int index) {
|
||||
if (index == -1) {
|
||||
addItem(stackA, meta, true);
|
||||
addItem(stackA, meta);
|
||||
return;
|
||||
}
|
||||
addRealItem(index, stackA, true, true);
|
||||
addRealItem(index, stackA, true);
|
||||
metadata.add(index, meta);
|
||||
onGridChanged();
|
||||
}
|
||||
|
||||
public void replaceItem(int idx, ItemStack stack) {
|
||||
setRealItem(idx, stack, true, true);
|
||||
setRealItem(idx, stack, true);
|
||||
onGridChanged();
|
||||
}
|
||||
|
||||
@@ -337,8 +337,7 @@ public class BookmarkPanel extends PanelWidget {
|
||||
rect.x + 1,
|
||||
rect.y + 1,
|
||||
true,
|
||||
meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize),
|
||||
draggedStack == null);
|
||||
meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize));
|
||||
|
||||
if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
|
||||
drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
|
||||
@@ -770,8 +769,7 @@ public class BookmarkPanel extends PanelWidget {
|
||||
.get("ingredient")
|
||||
.getAsBoolean()
|
||||
: false,
|
||||
itemStackNBT.hasKey("gtFluidName")),
|
||||
false);
|
||||
itemStackNBT.hasKey("gtFluidName")));
|
||||
} else {
|
||||
NEIClientConfig.logger.warn(
|
||||
"Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}",
|
||||
@@ -925,7 +923,7 @@ public class BookmarkPanel extends PanelWidget {
|
||||
final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
|
||||
|
||||
sortedGrid.removeItem(sortedStackIndex);
|
||||
hoverGrid.addItem(stack, meta, true);
|
||||
hoverGrid.addItem(stack, meta);
|
||||
|
||||
sortedNamespaceIndex = activeNamespaceIndex;
|
||||
sortedStackIndex = hoverGrid.indexOf(stack, meta.recipeId);
|
||||
|
||||
@@ -58,7 +58,7 @@ public class ItemPanel extends PanelWidget {
|
||||
|
||||
if (newItems != null) {
|
||||
realItems.clear();
|
||||
addRealItems(newItems, false, false);
|
||||
addRealItems(newItems, false);
|
||||
newItems = null;
|
||||
onGridChanged();
|
||||
}
|
||||
|
||||
@@ -58,20 +58,20 @@ public class ItemsGrid {
|
||||
return realItems.get(idx).itemStack;
|
||||
}
|
||||
|
||||
protected void addRealItems(Collection<ItemStack> itemStack, boolean doMoveAnim, boolean doPopAnim) {
|
||||
itemStack.forEach(e -> addRealItem(e, doMoveAnim, doPopAnim));
|
||||
protected void addRealItems(Collection<ItemStack> itemStack, boolean doPopAnim) {
|
||||
itemStack.forEach(e -> addRealItem(e, doPopAnim));
|
||||
}
|
||||
|
||||
protected void addRealItem(ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
|
||||
realItems.add(new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
|
||||
protected void addRealItem(ItemStack itemStack, boolean doPopAnim) {
|
||||
realItems.add(new AnimatedItemStack(itemStack, doPopAnim));
|
||||
}
|
||||
|
||||
protected void addRealItem(int index, ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
|
||||
realItems.add(index, new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
|
||||
protected void addRealItem(int index, ItemStack itemStack, boolean doPopAnim) {
|
||||
realItems.add(index, new AnimatedItemStack(itemStack, doPopAnim));
|
||||
}
|
||||
|
||||
protected void setRealItem(int index, ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
|
||||
realItems.set(index, new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
|
||||
protected void setRealItem(int index, ItemStack itemStack, boolean doPopAnim) {
|
||||
realItems.set(index, new AnimatedItemStack(itemStack, doPopAnim));
|
||||
}
|
||||
|
||||
public int size() {
|
||||
|
||||
@@ -237,10 +237,6 @@ public class NEIClientConfig {
|
||||
.setComment("Use NBT in Bookmarks")
|
||||
.getBooleanValue(true);
|
||||
API.addOption(new OptionToggleButton("inventory.useNBTInBookmarks", true));
|
||||
tag.getTag("inventory.bookmarksAnimationEnabled")
|
||||
.setComment("REI Style Animation in Bookmarks")
|
||||
.getBooleanValue(true);
|
||||
API.addOption(new OptionToggleButton("inventory.bookmarksAnimationEnabled", true));
|
||||
tag.getTag("inventory.showRecipeMarker")
|
||||
.setComment("Show Recipe Marker")
|
||||
.getBooleanValue(false);
|
||||
@@ -508,10 +504,6 @@ public class NEIClientConfig {
|
||||
return getBooleanSetting("inventory.useNBTInBookmarks");
|
||||
}
|
||||
|
||||
public static boolean areBookmarksAnimated() {
|
||||
return getBooleanSetting("inventory.bookmarksAnimationEnabled");
|
||||
}
|
||||
|
||||
public static boolean showRecipeMarker() {
|
||||
return getBooleanSetting("inventory.showRecipeMarker");
|
||||
}
|
||||
|
||||
@@ -146,9 +146,6 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=Disabled
|
||||
nei.options.inventory.useNBTInBookmarks=Use NBT in Bookmarks
|
||||
nei.options.inventory.useNBTInBookmarks.true=Yes
|
||||
nei.options.inventory.useNBTInBookmarks.false=No
|
||||
nei.options.inventory.bookmarksAnimationEnabled=REI Style Animation in Bookmarks
|
||||
nei.options.inventory.bookmarksAnimationEnabled.true=Yes
|
||||
nei.options.inventory.bookmarksAnimationEnabled.false=No
|
||||
nei.options.inventory.showRecipeMarker=Show Recipe Marker
|
||||
nei.options.inventory.showRecipeMarker.true=Yes
|
||||
nei.options.inventory.showRecipeMarker.false=No
|
||||
|
||||
Reference in new issue
Block a user