Add configurable factory I/O + fix a few bugs #58

caucow · 2021-06-06T23:50:53Z

Adds configurable factory IO as described in #54.

Also fixes diode power loop in #51.

Possible fix for #40? Maybe only partial fix? Redstone dust triggers might not be possible with Paper.

Fixes diode triggers activating factories they are not pointing into. Will need additional work if other directional blocks have the same problem.

Updated the main factoryinstance UI, fix for #9? How updated does it all need to be, recipes are in a scroller and other buttons line the bottom.

Depends on CMC PR 101

Diet-Cola · 2021-06-09T12:29:03Z

On test

Yes, I am 100% firing some shots at #feedback here. :glad:

Diet-Cola · 2021-06-11T04:07:39Z

Updated test

Diet-Cola · 2021-06-11T04:19:47Z

[04:19:23 ERROR]: Could not pass event PlayerInteractEvent to FactoryMod v2.5.2
java.lang.NullPointerException: Cannot invoke "com.github.igotyou.FactoryMod.factories.FurnCraftChestFactory$UiMenuMode.ordinal()" because "curMode" is null
        at com.github.igotyou.FactoryMod.interactionManager.FurnCraftChestInteractionManager.buildMenuModeCycleButton(FurnCraftChestInteractionManager.java:337) ~[?:?]
        at com.github.igotyou.FactoryMod.interactionManager.FurnCraftChestInteractionManager.buildRecipeInventory(FurnCraftChestInteractionManager.java:220) ~[?:?]
        at com.github.igotyou.FactoryMod.interactionManager.FurnCraftChestInteractionManager.leftClick(FurnCraftChestInteractionManager.java:200) ~[?:?]
        at com.github.igotyou.FactoryMod.listeners.FactoryModListener.playerInteract(FactoryModListener.java:163) ~[?:?]
        at com.destroystokyo.paper.event.executor.asm.generated.GeneratedEventExecutor318.execute(Unknown Source) ~[?:?]
        at org.bukkit.plugin.EventExecutor.lambda$create$1(EventExecutor.java:69) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at co.aikar.timings.TimedEventExecutor.execute(TimedEventExecutor.java:80) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at org.bukkit.plugin.RegisteredListener.callEvent(RegisteredListener.java:70) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at org.bukkit.plugin.SimplePluginManager.callEvent(SimplePluginManager.java:624) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory.callPlayerInteractEvent(CraftEventFactory.java:549) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory.callPlayerInteractEvent(CraftEventFactory.java:512) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory.callPlayerInteractEvent(CraftEventFactory.java:507) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.PlayerInteractManager.a(PlayerInteractManager.java:210) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.PlayerConnection.a(PlayerConnection.java:1732) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.PacketPlayInBlockDig.a(SourceFile:40) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.PacketPlayInBlockDig.a(SourceFile:10) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.PlayerConnectionUtils.lambda$ensureMainThread$1(PlayerConnectionUtils.java:55) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.TickTask.run(SourceFile:18) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.IAsyncTaskHandler.executeTask(IAsyncTaskHandler.java:136) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.IAsyncTaskHandlerReentrant.executeTask(SourceFile:23) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.IAsyncTaskHandler.executeNext(IAsyncTaskHandler.java:109) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.MinecraftServer.bb(MinecraftServer.java:1325) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.MinecraftServer.executeNext(MinecraftServer.java:1318) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.IAsyncTaskHandler.executeAll(IAsyncTaskHandler.java:95) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.MinecraftServer.a(MinecraftServer.java:1455) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.MinecraftServer.w(MinecraftServer.java:1134) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at net.minecraft.server.v1_16_R3.MinecraftServer.lambda$a$0(MinecraftServer.java:292) ~[patched_1.16.5.jar:git-Tuinity-"f7c4249"]
        at java.lang.Thread.run(Thread.java:831) [?:?]

Default IO was only being initialized for old factories loaded from file, not new factories.

Diet-Cola · 2021-06-12T12:03:37Z

Updated test

caucow · 2021-06-13T00:54:14Z

Added configable fuelchests + limit options
defaults are

max_input_chests: 10
max_output_chests: 10
max_fuel_chests: 10
max_iof_chests: 15

Diet-Cola · 2021-06-13T11:18:38Z

Updated test

Diet-Cola · 2021-06-15T16:59:44Z

Minor note but if you dont mind updating your local paper Shadow and implementing the close() method in the MultiInventoryWrapper with this, same for your CMC PR with ClonedInventory

caucow · 2021-06-16T17:26:31Z

paper is better than this ffs
and why isn't close() just a default method... it can be a default method
updated (+cmc)

Convoy20 · 2021-08-11T20:37:33Z

@caucow is the check below an issue?

caucow · 2021-08-11T21:02:53Z

@caucow is the check below an issue?

Build fails because Could not find artifact vg.civcraft.mc.civmodcore:CivModCore:jar:1.8.4
because

Depends on CMC PR 101

It's not a problem, CMC just needs its PRs merged before this can build properly.
At a bare minimum, CivClassic/CivModCore#101 and CivClassic/CivModCore#102 also needs to be pulled, and CMC's dependencies in jenkins/whatever CI (idk anything about CI rip) need updated so that PR will build.

Maxopoly

Needs a lot of testing which I cant really comment on here, otherwise okay except for two minor things.

Maxopoly · 2021-08-15T14:07:08Z

src/main/java/com/github/igotyou/FactoryMod/factories/FurnCraftChestFactory.java

+		ArrayList<Inventory> invs = new ArrayList<>(12);
+		Block fblock = getFurnace();
+		BlockFace facing = getFacing();
+		for (BlockFace relativeFace : getFurnaceIOSelector().getInputs(facing)) {


This and all the copy pastes below should be extracted into a method

Maxopoly · 2021-08-17T14:58:36Z

src/main/java/com/github/igotyou/FactoryMod/utility/DirectionMask.java

+/**
+ * @author caucow
+ */
+public class DirectionMask {


Unless you're gonna store a few hundred million of these, please just forget about this C kind of optimization. Define an enum and use an EnumSet to generate both a human reaadable storage file and easier expandable code.

caucow · 2021-08-19T19:58:14Z

Needs a lot of testing which I cant really comment on here, otherwise okay except for two minor things.

I spent a lot of time in game testing the new features including chaining a number of the new factories together in different configurations (which lead to me fixing some of the other older bugs since they were interfering, then testing those fixes/discussing behavior in praxis), checking input/output/fuel being consumed (or not) when directions are toggled, making sure factories shut off when the MultiInv doesn't have required mats, some crude performance testing (perf hit scales linearly with number of items/chests in a MultiInv, hard config limits added to prevent compact factory lag machines, next to no extra overhead that wasn't already included), some stability testing (not much because the plugin is barely designed with fail cases and config/storage issues in mind), plus whatever time people on the CC test server spent with it. Is there anything specific you're concerned about?

Latest commit changes should probably get more testing (I'm out of town atm), most I did was make sure it compiled, run, let me make and configure factories, and properly saved/loaded/reloaded factory storage.

Convoy20 · 2021-08-19T22:52:08Z

Newest build is on test

Maxopoly

Resolves my complaints nicely

Maxopoly · 2021-08-20T23:56:01Z

Might want to also include user friendly behavior for server which decide to not enable this feature. I know that you can just set it to 0 in the config, but mean rather making sure that the GUI and/or help messages aren't confusing and indicating towards something thats disabled.
Not terribly important though

- Make text in ioconfig screen more clear and noticeable - Barriers for missing chests pop back after configuring - Fix for factories not auto-selecting a new recipe if ingredients run out mid-run - Fix for async-block-access on factory save - General minor code cleanup and renaming

CivClassic/CivModCore#101 and CivClassic/CivModCore#102 and CivClassic/FactoryMod#58

caucow added 7 commits June 4, 2021 10:27

Simplify multiblock constructor

54c53d7

Bump version 2.5.1 -> 2.5.2 + CMC dep 1.8.2 -> 1.8.4

d6facae

Add configurable factory IO

c42779a

Fix overlooked change in simplified code

5b1296d

fix typo in multiinv + rename locals for clarity

473c052

Fix redstone detect direction for diode types

19e7dd2

Fix flashing diodes when factories are powered

0beaf52

caucow added 4 commits June 10, 2021 16:26

Default main factory chest to BOTH for unconfigured

9c14c54

Make <no chest> bold because the barrier wasn't visible enough ? ? ? ?

c6a8511

Cardinals mode for nerds with a killer mental compass but no eyes

253c116

Yes, I am 100% firing some shots at #feedback here. :glad:

Make factory IO config section collapsible

302431f

caucow added 2 commits June 11, 2021 00:13

Fix NPE - Initialize default UiMenuMode

c70c397

Properly init default IO config +lazy init since getBlock called

5f10830

Default IO was only being initialized for old factories loaded from file, not new factories.

Add configurable fuel chests + I/O/F/total chest limit

a5506c8

Accommodate mid-version api compatibility change (come on paper ffs)

4e87c1f

TheOrangeWizard mentioned this pull request Jun 23, 2021

Recipes to help limit hopper + farm storage chests CivClassic/AnsibleSetup#217

Closed

Maxopoly requested changes Aug 17, 2021

View reviewed changes

Kleen up and tone down civtastic civtistic code (re: Max's reviews)

a15ace0

caucow requested a review from Maxopoly August 19, 2021 19:53

caucow added 3 commits August 19, 2021 20:23

Fixes for potential fuel bug that hasn't presented yet

a6d51f6

Fix furnace fuel level being reset a tick after consumption

2e24bc1

Fix scheduler exception when disabling furnaces while disabling plugin

0f6a1e8

caucow force-pushed the configurable-io branch from 0438ad9 to e162382 Compare August 20, 2021 19:04

Maxopoly approved these changes Aug 20, 2021

View reviewed changes

caucow force-pushed the configurable-io branch from e162382 to 72801df Compare August 21, 2021 17:27

FIx fix for autoselect not disabling factories

2bd4f3e

wingzero54 merged commit a1fde29 into CivClassic:master Aug 28, 2021

wingzero54 added a commit to CivClassic/AnsibleSetup that referenced this pull request Aug 28, 2021

Update CMC and FM

5205ea2

CivClassic/CivModCore#101 and CivClassic/CivModCore#102 and CivClassic/FactoryMod#58

caucow deleted the configurable-io branch August 30, 2021 03:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add configurable factory I/O + fix a few bugs #58

Add configurable factory I/O + fix a few bugs #58

caucow commented Jun 6, 2021

Diet-Cola commented Jun 9, 2021

Diet-Cola commented Jun 11, 2021

Diet-Cola commented Jun 11, 2021

Diet-Cola commented Jun 12, 2021

caucow commented Jun 13, 2021

Diet-Cola commented Jun 13, 2021

Diet-Cola commented Jun 15, 2021

caucow commented Jun 16, 2021

Convoy20 commented Aug 11, 2021 •

edited

Loading

caucow commented Aug 11, 2021 •

edited

Loading

Maxopoly left a comment

Maxopoly Aug 15, 2021

Maxopoly Aug 17, 2021

caucow commented Aug 19, 2021 •

edited

Loading

Convoy20 commented Aug 19, 2021

Maxopoly left a comment

Maxopoly commented Aug 20, 2021 •

edited

Loading

Add configurable factory I/O + fix a few bugs #58

Add configurable factory I/O + fix a few bugs #58

Conversation

caucow commented Jun 6, 2021

Diet-Cola commented Jun 9, 2021

Diet-Cola commented Jun 11, 2021

Diet-Cola commented Jun 11, 2021

Diet-Cola commented Jun 12, 2021

caucow commented Jun 13, 2021

Diet-Cola commented Jun 13, 2021

Diet-Cola commented Jun 15, 2021

caucow commented Jun 16, 2021

Convoy20 commented Aug 11, 2021 • edited Loading

caucow commented Aug 11, 2021 • edited Loading

Maxopoly left a comment

Choose a reason for hiding this comment

Maxopoly Aug 15, 2021

Choose a reason for hiding this comment

Maxopoly Aug 17, 2021

Choose a reason for hiding this comment

caucow commented Aug 19, 2021 • edited Loading

Convoy20 commented Aug 19, 2021

Maxopoly left a comment

Choose a reason for hiding this comment

Maxopoly commented Aug 20, 2021 • edited Loading

Convoy20 commented Aug 11, 2021 •

edited

Loading

caucow commented Aug 11, 2021 •

edited

Loading

caucow commented Aug 19, 2021 •

edited

Loading

Maxopoly commented Aug 20, 2021 •

edited

Loading