From 88d90c2d07425951180aad1a48b3b6c73da466de Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Fri, 17 Apr 2020 00:52:36 +0200 Subject: [PATCH] Fixed basic ItemFilter --- options.txt | 118 ++++++++++++++++++ .../conduit/item/filter/ItemFilter.java | 1 + 2 files changed, 119 insertions(+) create mode 100644 options.txt diff --git a/options.txt b/options.txt new file mode 100644 index 00000000..6004c84f --- /dev/null +++ b/options.txt @@ -0,0 +1,118 @@ +invertYMouse:false +mouseSensitivity:0.5 +fov:0.0 +gamma:0.0 +saturation:0.0 +renderDistance:12 +guiScale:3 +particles:0 +bobView:true +anaglyph3d:false +advancedOpengl:false +maxFps:120 +fboEnable:true +difficulty:2 +fancyGraphics:true +ao:2 +clouds:true +resourcePacks:[] +lastServer: +lang:en_US +chatVisibility:0 +chatColors:true +chatLinks:true +chatLinksPrompt:true +chatOpacity:1.0 +snooperEnabled:true +fullscreen:false +enableVsync:true +hideServerAddress:false +advancedItemTooltips:true +pauseOnLostFocus:true +showCape:true +touchscreen:false +overrideWidth:0 +overrideHeight:0 +heldItemTooltips:true +chatHeightFocused:1.0 +chatHeightUnfocused:0.44366196 +chatScale:1.0 +chatWidth:1.0 +showInventoryAchievementHint:false +mipmapLevels:4 +anisotropicFiltering:1 +streamBytesPerPixel:0.5 +streamMicVolume:1.0 +streamSystemVolume:1.0 +streamKbps:0.5412844 +streamFps:0.31690142 +streamCompression:1 +streamSendMetadata:true +streamPreferredServer: +streamChatEnabled:0 +streamChatUserFilter:0 +streamMicToggleBehavior:0 +forceUnicodeFont:false +key_key.attack:-100 +key_key.use:-99 +key_key.forward:17 +key_key.left:30 +key_key.back:31 +key_key.right:32 +key_key.jump:57 +key_key.sneak:42 +key_key.drop:16 +key_key.inventory:18 +key_key.chat:20 +key_key.playerlist:15 +key_key.pickItem:-98 +key_key.command:53 +key_key.screenshot:60 +key_key.togglePerspective:63 +key_key.smoothCamera:0 +key_key.sprint:29 +key_key.streamStartStop:64 +key_key.streamPauseUnpause:65 +key_key.streamCommercial:0 +key_key.streamToggleMic:0 +key_key.fullscreen:87 +key_key.hotbar.1:2 +key_key.hotbar.2:3 +key_key.hotbar.3:4 +key_key.hotbar.4:5 +key_key.hotbar.5:6 +key_key.hotbar.6:7 +key_key.hotbar.7:8 +key_key.hotbar.8:9 +key_key.hotbar.9:10 +key_key.charge:47 +key_key.extra:46 +key_key.release:19 +key_key.toggle:34 +key_waila.keybind.wailaconfig:82 +key_waila.keybind.wailadisplay:79 +key_waila.keybind.liquid:80 +key_waila.keybind.recipe:81 +key_waila.keybind.usage:75 +key_Baubles Inventory:48 +key_Change Wand Focus:33 +key_Activate Hover Harness:35 +key_Misc Wand Toggle:34 +key_Glider Toggle:34 +key_Sound Locator:38 +key_Night Vision:25 +key_Goggles of Revealing:19 +key_Step Assist:0 +key_Speed:0 +key_Jump:0 +key_Yeta Wrench Mode:21 +key_Toggle Electromagnet:0 +soundCategory_master:0.0 +soundCategory_music:0.0 +soundCategory_record:1.0 +soundCategory_weather:0.0 +soundCategory_block:1.0 +soundCategory_hostile:1.0 +soundCategory_neutral:1.0 +soundCategory_player:1.0 +soundCategory_ambient:1.0 diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index e35c7974..a90e13b4 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -285,6 +285,7 @@ public class ItemFilter implements IInventory, IItemFilter { numItems = nbtRoot.getInteger("numItems"); if(numItems<10 && isAdvanced) numItems = 10; + else if(numItems<5 && !isAdvanced) numItems = 5; items = new ItemStack[numItems]; oreIds.clear();