Added an option to toggle oredict substitutions for patterns. #1891

yueh · 2015-09-21T22:27:59Z

It adds a backward compatibility to convert current patterns to use
oredict by default, which should be removed with rv4 stable.

Closes #1156

orod-org · 2015-09-21T22:29:28Z

src/main/java/appeng/core/sync/packets/PacketValueConfig.java

@@ -158,6 +158,10 @@ else if( this.Name.equals( "PatternTerminal.Clear" ) )
 			{
 				cpt.clear();
 			}
+			else if( this.Name.equals( "PatternTerminal.Substitute" ) )


Move the "PatternTerminal.Substitute" string literal on the left side of this string comparison.

orod-org · 2015-09-21T22:29:29Z

src/main/java/appeng/core/sync/packets/PacketValueConfig.java

@@ -158,6 +158,10 @@ else if( this.Name.equals( "PatternTerminal.Clear" ) )
 			{
 				cpt.clear();
 			}
+			else if( this.Name.equals( "PatternTerminal.Substitute" ) )
+			{
+				cpt.ct.setSubstitution( this.Value.equals( "1" ) );


Move the "1" string literal on the left side of this string comparison.

orod-org · 2015-09-21T22:29:29Z

src/main/java/appeng/crafting/CraftingTreeNode.java

-	boolean sim;
+	private int bytes = 0;
+	private boolean canEmit = false;
+	private boolean cannotUse = false;


Remove this unused "cannotUse" private field.

orod-org · 2015-09-21T22:29:30Z

src/main/java/appeng/core/localization/ButtonToolTips.java

@@ -54,7 +54,7 @@

 	LevelType, LevelType_Energy, LevelType_Item, InventoryTweaks, TerminalStyle, TerminalStyle_Full, TerminalStyle_Tall, TerminalStyle_Small,

-	Stash, StashDesc, Encode, EncodeDescription, Substitutions, SubstitutionsOn, SubstitutionsOff, SubstitutionsDesc, CraftOnly, CraftEither,
+	Stash, StashDesc, Encode, EncodeDescription, Substitutions, SubstitutionsOn, SubstitutionsOff, SubstitutionsDescEnabled, SubstitutionsDescDisabled, CraftOnly, CraftEither,


Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

orod-org · 2015-09-21T22:29:30Z

src/main/java/appeng/core/localization/GuiText.java

+	And,
+	With,
+	Substitute,
+	Yes,


Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

orod-org · 2015-09-21T22:29:30Z

src/main/java/appeng/core/localization/GuiText.java

+	With,
+	Substitute,
+	Yes,
+	No,


Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

orod-org · 2015-09-21T22:29:31Z

src/main/java/appeng/core/localization/GuiText.java

+	Yes,
+	No,
+
+	MolecularAssembler,


Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

yueh · 2015-09-23T11:48:19Z

I am also not fully convinced about how to handle the backward compatibility.
Should we consider any "old" pattern as oredict enabled or not. According to the existing code in PatternHelper.canSubstitute(), they were actually not intended to use any substitute.

thatsIch · 2015-09-23T13:07:09Z

I think oredict should be off by default.

yueh · 2015-09-23T13:12:13Z

I also tend to this option, but will potentially cause more issues to players when upgrading and their tendency to ignore changelogs.

thatsIch · 2015-09-23T20:24:31Z

ah, the old pattern did support oredict right,
then 1.7 on by default with a //TODO marker?

yueh · 2015-09-23T20:39:28Z

Old patterns are supporting oredict as it was the only option. But codewise it seems they should not.

New patterns will now have a new nbttag, but nonexistant nbttags will by default fallback to false, so it currently checks if the tag exists and if not will fallback to true instead.
It would be possible to simply negate it at one point, but this is really clunky, if the code works with "can", but stored as "cannot".

Also there is already a TODO for the pattern helper to remove it at one point.
If completely new patterns then use oredict or not by default is not really important. I honestly have currently even no idea what the default option is.

thatsIch · 2015-09-23T20:46:18Z

I think new patterns should have ore dict off per default.
You could also add a transition item with a text like "put into bench to convert to new" or so like the old TE pipes in 1.6

Might be the cleanest solution from player perspective

yueh · 2015-09-23T20:57:28Z

A transition item would be extremely intrusive to existing builds as this would mean update every single pattern.

Disabling it would mean only recreate needed ones, but still will require some player interaction.

Enabling will keep the current behaviour, but need like 5 lines of code extra to handle it.

yueh · 2015-09-26T11:32:06Z

I slowly tend towards disabling it even for old patterns. The crafting system is already designed around precise items when calculating the crafting tree and most requests are about disabling this feature in general.

I really cannot remember any real feedback regarding it is an actually used very frequently, But the positive feedback is way more rare then negative ones.
Also the amount of patterns requiring oredict enable is probably way less then these requiring it disabled, so I would assume it will be less work for the players actually and I have no issue about closing a couple of issues and linking the changelogs.

thatsIch · 2015-09-26T18:00:20Z

sounds about right

thatsIch · 2015-10-06T07:26:18Z

src/api/java/appeng/api/config/Substitution.java

+package appeng.api.config;
+
+
+public enum Substitution


should probably state for what usage this is supposed to be used. Sometimes there are duplicate classes which do nearly the same but are used in different contextes and to obtain type-safety they use different ones.

thatsIch · 2015-10-06T07:28:36Z

src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java

+
+			if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
+			{
+				NetworkHandler.instance.sendToServer( new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? "0" : "1" ) );


should probably const the 0 and the 1 out to clarify meaning

Might be even an idea to refactor PacketValueConfig to also accept an enum instead of just a random string. Serialization probably still has to fall back to .ordinal() or similar.

thatsIch · 2015-10-06T07:30:54Z

src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java

+			this.substitutionsEnabledBtn.visible = false;
+			this.substitutionsDisabledBtn.visible = true;
+		}
+


just thinking as enhancement:

A class ToggleGroup or so, and if you make 1 button visible, all others are disabled via listener. Would be probably interessting in other button groups, so adding a new state is far easier than hard-coding the state.

Good idea. The whole gui could see some improvments. But simply not enough time currently to also refactor this.

thatsIch · 2015-10-06T07:33:28Z

src/main/java/appeng/container/implementations/ContainerPatternTerm.java

+			if( this.substitute != this.ct.isSubstitution() )
+			{
+				this.substitute = this.ct.isSubstitution();
+			}


so its always this.substitute = this.ct.isSubstitution();? any performance implications why the ifis used?

Hm yeah. Mostly pointless. I think I left it intentionally there in case it needed something similar to the crafting mode and updateOrderOfOutputSlots().

thatsIch · 2015-10-06T07:36:19Z

src/main/java/appeng/crafting/CraftingTreeNode.java

+
+			if( this.parent.details.canSubstitute() )
+			{
+				itemList = inv.getItemList().findFuzzy( this.what, FuzzyMode.IGNORE_ALL );


inv.getItemList() used in both branches

thatsIch · 2015-10-06T07:40:02Z

src/main/java/appeng/helpers/PatternHelper.java

 	{
 		ACCEPT, DECLINE, TEST
 	}

-	static class TestLookup
+	private static class TestLookup


It adds a backward compatibility to convert current patterns to use oredict by default, which should be removed with rv4 stable. Closes #1156

orod-org · 2015-10-06T09:35:18Z

SonarQube analysis reported 9 issues:

4 major
5 minor

Watch the comments in this conversation to review them.
Note: the following issues could not be reported as comments because they are located on lines that are not displayed in this pull request:

Unwritten public or protected field: appeng.client.gui.widgets.GuiImgButton.fillVar
The Cyclomatic Complexity of this method "addCheckedInformation" is 11 which is greater than 10 authorized.

thatsIch · 2015-10-08T19:49:47Z

src/main/java/appeng/core/sync/packets/PacketValueConfig.java

-	public final String Name;
-	public final String Value;
+	private final String Name;
+	private final String Value;


vars should start lower case and not like classes

I know.. There are a bunch of them. Probably something I will tackle should the PR for private fields be merged. Also the whole PacketValueConfig is a bit cheesy. Something I want to address with the network refactoring.

thatsIch · 2015-10-08T19:51:31Z

Looks fine, I will live test it tomorrow

thatsIch · 2015-10-10T15:50:16Z

A nice thing would be if you could see a difference in oredict vs not. This can be another FR though

thatsIch · 2015-10-10T15:58:48Z

Upon crafting my client crashes

thatsIch · 2015-10-10T15:58:59Z

Tried several times already, still failing

thatsIch · 2015-10-10T15:59:10Z

http://paste.ee/p/Ma6uz

thatsIch · 2015-10-10T16:00:36Z

This still crashes without NEI and CC

thatsIch · 2015-10-10T16:05:16Z

https://imgur.com/a/VuBpG setup

thatsIch · 2015-10-10T16:31:19Z

Another thing is the place of the substitution button, not sure if this should be there, but maybe below the crafting/processing switch?

yueh · 2015-10-10T16:37:13Z

The button was already there. Just hidden, so I simply kept it.

Different icon? As the tooltip already shows if enabled or not and this is also visible inside an interface terminal.

Regarding the crash see: https://bugs.mojang.com/browse/MC-32606

thatsIch · 2015-10-10T16:57:42Z

Attached the HS log

http://puu.sh/kFif6/e521e32c19.log

thatsIch · 2015-10-10T17:44:29Z

Using the super latest driver fixes this issue or force not to use your 2D desktop application GFX-card

thatsIch · 2015-10-10T17:45:59Z

I mean a direct indicator like upon shift show an iron ingot in the corner to indicate that these are oredictionaried.

yueh · 2015-10-10T18:32:44Z

Hm. There is just the general issue with only 16x16 pixel large icons.

But probably another FR. Also not sure if still possible with 1.8/1.9. I do not really want to add something, if we already know it needs to be reverted later.

Added an option to toggle oredict substitutions for patterns.

yueh changed the title ~~Added an option to toggle oredict subsitutions for patterns.~~ Added an option to toggle oredict substitutions for patterns. Sep 21, 2015

orod-org reviewed Sep 21, 2015
View changes

src/main/java/appeng/crafting/CraftingTreeNode.java

boolean sim;

private int bytes = 0;

private boolean canEmit = false;

private boolean cannotUse = false;

This comment has been minimized.

Sign in to view

orod-org Sep 21, 2015

Remove this unused "cannotUse" private field.

orod-org reviewed Sep 21, 2015
View changes

src/main/java/appeng/core/localization/GuiText.java

And,

With,

Substitute,

Yes,

This comment has been minimized.

Sign in to view

orod-org Sep 21, 2015

Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

orod-org reviewed Sep 21, 2015
View changes

src/main/java/appeng/core/localization/GuiText.java

With,

Substitute,

Yes,

No,

This comment has been minimized.

Sign in to view

orod-org Sep 21, 2015

Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

orod-org reviewed Sep 21, 2015
View changes

src/main/java/appeng/core/localization/GuiText.java

Yes,

No,

MolecularAssembler,

This comment has been minimized.

Sign in to view

orod-org Sep 21, 2015

Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]([A-Z0-9]+)_$'.

yueh added this to the rv3 - 1.7.10 milestone Sep 22, 2015

yueh force-pushed the yueh:feature-1156 branch 3 times, most recently from ceeface to 9030fb6 Sep 26, 2015

thatsIch reviewed Oct 6, 2015
View changes

src/main/java/appeng/helpers/PatternHelper.java Outdated

{

ACCEPT, DECLINE, TEST

}

static class TestLookup

private static class TestLookup

This comment has been minimized.

Sign in to view

thatsIch Oct 6, 2015
Member

final?

yueh force-pushed the yueh:feature-1156 branch from 9030fb6 to 70d28f3 Oct 6, 2015

Added an option to toggle oredict subsitutions for patterns.

Loading status checks…

24224a4

It adds a backward compatibility to convert current patterns to use oredict by default, which should be removed with rv4 stable. Closes #1156

yueh force-pushed the yueh:feature-1156 branch from 70d28f3 to 24224a4 Oct 6, 2015

thatsIch reviewed Oct 8, 2015
View changes

thatsIch self-assigned this Oct 8, 2015

thatsIch added the review-waiting label Oct 8, 2015

thatsIch added review-rejected and removed review-waiting labels Oct 10, 2015

thatsIch added review-waiting and removed review-rejected labels Oct 10, 2015

thatsIch added review-accepted and removed review-waiting labels Oct 10, 2015

yueh added a commit that referenced this pull request Oct 10, 2015

Merge pull request #1891 from yueh/feature-1156

Loading status checks…

5643519

Added an option to toggle oredict substitutions for patterns.

github-actions bot locked as resolved and limited conversation to collaborators Mar 28, 2020

AppliedEnergistics / Applied-Energistics-2

Added an option to toggle oredict substitutions for patterns. #1891

Added an option to toggle oredict substitutions for patterns. #1891

Conversation

yueh commented Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

This comment has been minimized.

orod-org Sep 21, 2015

yueh commented Sep 23, 2015

thatsIch commented Sep 23, 2015

yueh commented Sep 23, 2015

thatsIch commented Sep 23, 2015

yueh commented Sep 23, 2015

thatsIch commented Sep 23, 2015

yueh commented Sep 23, 2015

yueh commented Sep 26, 2015

thatsIch commented Sep 26, 2015

This comment has been minimized.

thatsIch Oct 6, 2015 Member

This comment has been minimized.

thatsIch Oct 6, 2015 Member

This comment has been minimized.

yueh Oct 6, 2015 Author Member

This comment has been minimized.

thatsIch Oct 6, 2015 Member

This comment has been minimized.

yueh Oct 6, 2015 Author Member

This comment has been minimized.

thatsIch Oct 6, 2015 Member

This comment has been minimized.

yueh Oct 6, 2015 Author Member

This comment has been minimized.

thatsIch Oct 6, 2015 Member

This comment has been minimized.

thatsIch Oct 6, 2015 Member

orod-org commented Oct 6, 2015

This comment has been minimized.

thatsIch Oct 8, 2015 Member

This comment has been minimized.

yueh Oct 8, 2015 Author Member

thatsIch commented Oct 8, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

yueh commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

thatsIch commented Oct 10, 2015

yueh commented Oct 10, 2015

thatsIch Oct 6, 2015
Member

thatsIch Oct 6, 2015
Member

yueh Oct 6, 2015
Author Member

thatsIch Oct 6, 2015
Member

yueh Oct 6, 2015
Author Member

thatsIch Oct 6, 2015
Member

yueh Oct 6, 2015
Author Member

thatsIch Oct 6, 2015
Member

thatsIch Oct 6, 2015
Member

thatsIch Oct 8, 2015
Member

yueh Oct 8, 2015
Author Member