mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-17 19:15:13 +00:00
Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
606515a6c7 | ||
|
|
6c63c03cbc | ||
|
|
43c3d66868 | ||
|
|
67e74498bf | ||
|
|
b8b2b1f4f5 | ||
|
|
c311d48500 | ||
|
|
03709d8efa | ||
|
|
0ce4118e36 | ||
|
|
8aea03c251 | ||
|
|
d451fe5aa8 | ||
|
|
d01fb80c54 | ||
|
|
a136fdd717 | ||
|
|
2afbe162e4 |
No files matched your search
+2
-2
@@ -1,7 +1,7 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev')
|
||||
compile('com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev')
|
||||
compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
|
||||
compile('com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev')
|
||||
shadowImplementation('org.apache.commons:commons-csv:1.8')
|
||||
}
|
||||
@@ -30,17 +30,14 @@ public class AnimatedItemStack {
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
if (doPopAnim && currentScale < 1) {
|
||||
drawPoppingItem(x, y, smallAmount, stackSize);
|
||||
return;
|
||||
}
|
||||
if (doMoveAnim && (lastPosX != x || lastPosY != y) && !blockMoveAnimOnce) {
|
||||
drawMovingItem(x, y, smallAmount, stackSize);
|
||||
return;
|
||||
}
|
||||
currentScale = 1;
|
||||
lastPosX = x;
|
||||
lastPosY = y;
|
||||
GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package codechicken.nei.drawable;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
/*
|
||||
* Taken from Mantle 1.12-1.3.3.49 under the MIT License
|
||||
@@ -71,7 +70,6 @@ public class GuiElementDuex {
|
||||
*/
|
||||
public int draw(int xPos, int yPos) {
|
||||
// drawModalRectWithCustomSizedTexture
|
||||
GL11.glColor4f(1, 1, 1, 1);
|
||||
GuiScreen.func_146110_a(xPos, yPos, x, y, w, h, texW, texH);
|
||||
return w;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.5/",
|
||||
"file": "CodeChickenLib-1.7.10-1.1.5.5.jar",
|
||||
"dev": "CodeChickenLib-1.7.10-1.1.5.5-dev.jar",
|
||||
"repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.3/",
|
||||
"file": "CodeChickenLib-1.7.10-1.1.5.3.jar",
|
||||
"dev": "CodeChickenLib-1.7.10-1.1.5.3-dev.jar",
|
||||
"class": "codechicken.lib.asm.ASMHelper",
|
||||
"coreLib": true
|
||||
}
|
||||
Reference in new issue
Block a user