Intellibeam Laserstation and captcha codes #489

Dweblenod · 2023-07-03T18:05:30Z

Continuation of @KingBalDoro's PR of the same name #478.

Gives each registered item its own captchalogue code which can now be typed into a Punch Designix. Certain items cannot be read by default and require the assistance of the Intellibeam Laserstation to read. XP is expended to decode those captchas.

Captcha for a given item is essentially random but tied to seed, so two different worlds with the same seed will have the same captchas for the same items but two different worlds with different seeds will have different captchas for the same items.

Intellibeam model originally from blankMushroom, with remodels by Doro

# Conflicts: # src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java

… enUs languageprovider

new alchemy helper function two new sounds new item texture registered sounds fixed UV ala blankMushroom added ticker refactored some of the blockEntity class changed chatFormatting style changed punchdesignix to recognize if item has decoded tag

Co-authored-by: kirderf1 <[email protected]>

…erstationBlock.java Co-authored-by: kirderf1 <[email protected]>

…stationBlockEntity.java Co-authored-by: kirderf1 <[email protected]>

…ore features of the intellibeam laserstation, ran data, among other things known issues - new intellibeam model isn't currently working

… the function ran data as well

added actionbar displays for clarity

# Conflicts: # CHANGELOG.md # src/main/java/com/mraof/minestuck/data/MinestuckEnUsLanguageProvider.java # src/main/java/com/mraof/minestuck/util/MSSoundEvents.java

…of code to bring it more in line with existing code, cleaned up code logic, removed text bolding from action bar messages to improve readability, fixed experience subtitle, added new message when card has been decoded

…the registry name of an item

…acted methods

…ed variable initialization positions/where code segments are done, renamed methods/variables, added javadoc to CardCaptchas, changed logic of isReadableCard(), added captcha to hovertext of applicable cards, removed changes to RightClickMessageItem

…(involving creating a Screen), added methods for getting item directly from captcha and visversa, fixed logic error with isReadableCard()

…atible with changes from intellibeam PR, made empty cards display perfectly generic item code and allow them to be accepted by machinery in more conditions, added captcha to ghost cards where appropriate

…wn decoding progress, added utility method to CardCaptchas, removed clientside checkfrom setCaptcha() in PunchDesignixBlockEntity

…aserstationBlockEntity.CAPTCHA_DECODED

…S message is displayed and made it so creative mode players dont lose xp

…omSource for CardCaptchas, removed broken crouch mechanic in PunchDesignixBlockEntity

src/main/java/com/mraof/minestuck/alchemy/CardCaptchas.java

src/main/java/com/mraof/minestuck/client/gui/PunchDesignixScreen.java

src/main/java/com/mraof/minestuck/network/data/ShareCaptchasPacket.java

src/main/java/com/mraof/minestuck/alchemy/CardCaptchas.java

kirderf1 · 2023-07-08T21:55:18Z

src/main/java/com/mraof/minestuck/data/tag/MinestuckItemTagsProvider.java

@@ -138,6 +138,7 @@ protected void addTags()
 		tag(BUGS).add(BUG_ON_A_STICK.get(), CHOCOLATE_BEETLE.get(), CONE_OF_FLIES.get(), GRASSHOPPER.get(), CICADA.get(), JAR_OF_BUGS.get());
 		tag(CONSORT_SNACKS).add(Items.COOKIE).addTag(BUGS);
 		tag(CREATIVE_SHOCK_RIGHT_CLICK_LIMIT).add(Items.CHORUS_FRUIT);
+		tag(UNREADABLE).add(CRUEL_FATE_CRUCIBLE.get(), ROYAL_DERINGER.get(), TRANSPORTALIZER.get(), TRANS_PORTALIZER.get(), FEAR_NO_ANVIL.get(), TYPHONIC_TRIVIALIZER.get(), QUILL_OF_ECHIDNA.get(), UMBRAL_INFILTRATOR.get(), FLUORITE_OCTET.get(), CLIENT_DISK.get(), SERVER_DISK.get(), GUTTER_THUMB_DRIVE.get(), GUTTER_BALL.get(), CAPTCHA_CARD.get(), CUEBALL.get(), BLACK_QUEENS_RING.get(), WHITE_QUEENS_RING.get(), BLACK_KINGS_SCEPTER.get(), WHITE_KINGS_SCEPTER.get()).add(Items.DRAGON_EGG).add(Items.DRAGON_HEAD).add(Items.DRAGON_BREATH).add(Items.NETHER_STAR).add(Items.COMMAND_BLOCK).add(Items.COMMAND_BLOCK_MINECART).add(Items.CHAIN_COMMAND_BLOCK).add(Items.REPEATING_COMMAND_BLOCK).add(Items.END_CRYSTAL).add(Items.EXPERIENCE_BOTTLE).add(Items.ELYTRA).add(Items.TOTEM_OF_UNDYING).add(Items.BEACON).add(Items.BEDROCK).add(Items.PUMPKIN);


I recall bringing up a conversation on whether captcha cards really should be in this tag (due to potentially getting in the way of early game alchemy), but I don't exactly recall where that conversation went. Mentioning it here more as a reminder to check it out.

I feel it helps extend the usefulness of raw cruxite. But I would be open to reverting it for the time being

src/main/java/com/mraof/minestuck/network/data/ShareCaptchasPacket.java

src/main/java/com/mraof/minestuck/network/PunchDesignixPacket.java

src/main/java/com/mraof/minestuck/client/gui/PunchDesignixScreen.java

…s, switch a return of null to instead throw an exception in getRegistryNameFromItem()

# Conflicts: # CHANGELOG.md # src/main/java/com/mraof/minestuck/blockentity/MSBlockEntityTypes.java # src/main/java/com/mraof/minestuck/data/MinestuckEnUsLanguageProvider.java

src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java

src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java

src/main/java/com/mraof/minestuck/item/CaptchaCardItem.java

src/main/java/com/mraof/minestuck/alchemy/CardCaptchas.java

…oop that uses iterator with for-each-loop

…code map

…y id string

…tchas

# Conflicts: # CHANGELOG.md

…ged a condition, fixed error in comment in PunchDesignixScreen, added distance check in PunchDesignixPacket

…ng, removed decodeAndEjectCard() and renamed applyReadableNBT() from applyDecodedTag(), removed getShareTag()

…ignixBlockEntity.java Co-authored-by: kirderf1 <[email protected]>

kirderf1

There's also serialization of item codes that would be good for added stability, as well as lazily computing codes.

src/main/java/com/mraof/minestuck/alchemy/CardCaptchas.java

src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java

…ng "captcha_code", changed/removed some comments, made it so that creative mode players dont need any starting XP to use the intellibeam

src/main/java/com/mraof/minestuck/alchemy/AlchemyHelper.java

Co-authored-by: kirderf1 <[email protected]>

SavedData is loaded lazily instead of at server start, so to make it work, card captchas should be accessed through the extra data

KingBalDoro and others added 30 commits April 30, 2023 21:08

added intellibeam block, added unreadable tag

cd6207d

Merge branch '1.19' into intellibeam-lazerstation

74a9532

# Conflicts: # src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java

Update PunchDesignixBlockEntity.java

e8aab85

updated changelog

225e7d1

ran data, fixed changelog, put entry in msitems and gave it a name in…

2c3ad3e

… enUs languageprovider

made block render in game, as well as fixed some smaller problems

b96e3f3

randata

47aa8b7

Made Significant progress

cda86e7

new alchemy helper function two new sounds new item texture registered sounds fixed UV ala blankMushroom added ticker refactored some of the blockEntity class changed chatFormatting style changed punchdesignix to recognize if item has decoded tag

changed the way the wait timer works and added a check for decoded items

a8df5be

Update src/main/java/com/mraof/minestuck/alchemy/AlchemyHelper.java

713b96d

Co-authored-by: kirderf1 <[email protected]>

Update src/main/java/com/mraof/minestuck/block/machine/IntellibeamLas…

e845539

…erstationBlock.java Co-authored-by: kirderf1 <[email protected]>

Update src/main/java/com/mraof/minestuck/blockentity/IntellibeamLaser…

639f453

…stationBlockEntity.java Co-authored-by: kirderf1 <[email protected]>

redesigned the intellibeam, added intellibeam block shape, finished c…

ce9661a

…ore features of the intellibeam laserstation, ran data, among other things known issues - new intellibeam model isn't currently working

fixed model issues, fixed wait timer inconsistencies

5ab6ea8

set wait timer check to <= 1 and removed it from every other check in…

4a7854b

… the function ran data as well

ran data, fixed issue with not being able to put card in block

2d94857

added to deploy list, fixed model error

1d53d78

added transportalizers and bedrock to unreadable list, and ranData

312d931

github review

e0fba28

added actionbar displays for clarity

Merge branch '1.19' into intellibeam-lazerstation

aa2782e

# Conflicts: # CHANGELOG.md # src/main/java/com/mraof/minestuck/data/MinestuckEnUsLanguageProvider.java # src/main/java/com/mraof/minestuck/util/MSSoundEvents.java

modified changelog

f3c6f1b

Created a method of making semi-random captchas for cards by hashing …

a4a15ab

…the registry name of an item

Added world seed randomization of hash string, reorganized code, extr…

3b9a1f0

…acted methods

Added method of setting and storing a captcha with the punch designix…

0b711a6

…(involving creating a Screen), added methods for getting item directly from captcha and visversa, fixed logic error with isReadableCard()

Added predetermined captcha codes, made mini punch designix more comp…

ef51d16

…atible with changes from intellibeam PR, made empty cards display perfectly generic item code and allow them to be accepted by machinery in more conditions, added captcha to ghost cards where appropriate

Added Map to intellibeam to allow for each scanned item to have its o…

30ae4e2

…wn decoding progress, added utility method to CardCaptchas, removed clientside checkfrom setCaptcha() in PunchDesignixBlockEntity

Added to/reworded Changelog entries, changed wording for IntellibeamL…

29c4bb7

…aserstationBlockEntity.CAPTCHA_DECODED

Moved serverStarted() into CardCaptchas,changed when DECODING_PROGRES…

0e553ef

…S message is displayed and made it so creative mode players dont lose xp

Reorganized isReadableCard() in AlchemyHelper, switched to using Rand…

7f940d9

…omSource for CardCaptchas, removed broken crouch mechanic in PunchDesignixBlockEntity

Dweblenod commented Jul 7, 2023

View reviewed changes

kirderf1 requested changes Jul 8, 2023

View reviewed changes

Dweblenod added 3 commits July 12, 2023 20:17

Experimenting with creation of class dedicated to client side captcha…

8d48398

…s, switch a return of null to instead throw an exception in getRegistryNameFromItem()

Merge remote-tracking branch 'mraof/1.19' into intellibeam

86b40f3

# Conflicts: # CHANGELOG.md # src/main/java/com/mraof/minestuck/blockentity/MSBlockEntityTypes.java # src/main/java/com/mraof/minestuck/data/MinestuckEnUsLanguageProvider.java

Fixed client side issues related to introduction of ClientCardCaptchas

843f1ba

kirderf1 requested changes Jul 13, 2023

View reviewed changes

kirderf1 and others added 11 commits July 19, 2023 23:23

Make CardCaptchas.iterateThroughRegistry() static

7e055c4

Use items in captcha code maps, more private functions, replace for-l…

25659df

…oop that uses iterator with for-each-loop

Nullability annotation on getItemFromCaptcha()

a03d962

Sync codes with shared tag on card stack and stop syncing the entire …

875b63f

…code map

Rename and rework storedDecodings to use an item instead of a registr…

e084900

…y id string

Handle random in a more robust way when generating captchas

fd0762b

Reorganize CardCaptchas, isolating the functions used to generate cap…

2c43386

…tchas

Merge remote-tracking branch 'mraof/1.19' into intellibeam

85bd4bb

# Conflicts: # CHANGELOG.md

Changed variable names in IntellibeamLaserstationBlockEntity and chan…

6baa0c4

…ged a condition, fixed error in comment in PunchDesignixScreen, added distance check in PunchDesignixPacket

Added captcha code to nbt of cards upon their creation or upon decodi…

adae5b2

…ng, removed decodeAndEjectCard() and renamed applyReadableNBT() from applyDecodedTag(), removed getShareTag()

Update src/main/java/com/mraof/minestuck/blockentity/machine/PunchDes…

b27b65b

…ignixBlockEntity.java Co-authored-by: kirderf1 <[email protected]>

kirderf1 reviewed Jul 22, 2023

View reviewed changes

src/main/java/com/mraof/minestuck/alchemy/CardCaptchas.java Outdated Show resolved Hide resolved

src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java Outdated Show resolved Hide resolved

Removed "decoded" nbt from captcha cards by just using already existi…

c2b689d

…ng "captcha_code", changed/removed some comments, made it so that creative mode players dont need any starting XP to use the intellibeam

kirderf1 reviewed Jul 22, 2023

View reviewed changes

src/main/java/com/mraof/minestuck/alchemy/AlchemyHelper.java Outdated Show resolved Hide resolved

Dweblenod and others added 7 commits July 22, 2023 14:48

Update src/main/java/com/mraof/minestuck/alchemy/AlchemyHelper.java

315cf0a

Co-authored-by: kirderf1 <[email protected]>

Serialize card captchas within extra data

bc8f0fc

Simplify handling of backup captchas

bc74d9c

Lazily generate captcha codes

2618e45

Fix serialization of captchas

4a0bc52

SavedData is loaded lazily instead of at server start, so to make it work, card captchas should be accessed through the extra data

Added captcha cards to medium basic loot table for all lands

ffff661

Grammar fix and readded space

557e5b2

Dweblenod merged commit 7214520 into lunar-sway:1.19 Jul 22, 2023
1 check passed

Dweblenod deleted the intellibeam branch October 29, 2023 22:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Intellibeam Laserstation and captcha codes #489

Intellibeam Laserstation and captcha codes #489

Dweblenod commented Jul 3, 2023

kirderf1 Jul 8, 2023

Dweblenod Jul 22, 2023

kirderf1 left a comment

Intellibeam Laserstation and captcha codes #489

Intellibeam Laserstation and captcha codes #489

Conversation

Dweblenod commented Jul 3, 2023

kirderf1 Jul 8, 2023

Choose a reason for hiding this comment

Dweblenod Jul 22, 2023

Choose a reason for hiding this comment

kirderf1 left a comment

Choose a reason for hiding this comment