diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51b02af4..2159d105 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,26 +19,50 @@ jobs: uses: gradle/actions/wrapper-validation@v3 - name: Compile JavaScript run: ./gradlew generateJavaScript - - name: Compile assets + - name: Compile assets.epk run: bash ./CompileEPK.sh - - name: Generate offline download + - name: Generate offline download - standard if: github.ref != 'refs/heads/main' run: bash ./MakeOfflineDownload.sh - - name: Generate signed client + - name: Generate offline download - signed if: github.ref == 'refs/heads/main' - run: source ./SIGNED_CLIENT.env && echo -e "${{ vars.SIGNED_CLIENT_INPUT }}${{ secrets.SIGNED_CLIENT_SECRET }}" | bash ./MakeSignedClient.sh - - name: Prepare files - standard - if: github.ref != 'refs/heads/main' run: | - mkdir -p ${{ runner.temp }}/gh-pages - cp -t ${{ runner.temp }}/gh-pages \ - javascript/assets.epk \ - javascript/classes.js \ - javascript/classes.js.map \ - javascript/favicon.png \ + source ./SIGNED_CLIENT.env && + SIGNED_CLIENT_INPUT="${{ vars.SIGNED_CLIENT_INPUT }}${{ secrets.SIGNED_CLIENT_SECRET }}" && + echo "$SIGNED_CLIENT_INPUT" | bash ./MakeSignedClient.sh && + echo "$SIGNED_CLIENT_INPUT" | bash ./MakeSignedClient.sh + - name: Upload web files + continue-on-error: true + uses: actions/upload-artifact@v4 + with: + name: web + path: | + javascript/assets.epk + javascript/classes.js + javascript/classes.js.map + javascript/favicon.png javascript/index.html - cp javascript/Starlike_Client_Offline.html ${{ runner.temp }}/gh-pages/offline.html - - name: Prepare files - signed + retention-days: 1 + compression-level: 9 + - name: Upload offline download - standard + if: github.ref != 'refs/heads/main' + continue-on-error: true + uses: actions/upload-artifact@v4 + with: + name: offline + path: javascript/Starlike_Client_Offline.html + retention-days: 1 + compression-level: 9 + - name: Upload offline download - signed + if: github.ref == 'refs/heads/main' + continue-on-error: true + uses: actions/upload-artifact@v4 + with: + name: offline_signed + path: javascript/Starlike_Client_Offline_Signed.html + retention-days: 1 + compression-level: 9 + - name: Prepare GitHub Pages if: github.ref == 'refs/heads/main' run: | mkdir -p ${{ runner.temp }}/gh-pages @@ -50,21 +74,13 @@ jobs: javascript/index.html cp javascript/Starlike_Client_Offline_Signed.html ${{ runner.temp }}/gh-pages/offline.html cp javascript/Starlike_Client_Offline_Signed.html.dat ${{ runner.temp }}/gh-pages/latest_update.dat - - name: Upload web files - continue-on-error: true - uses: actions/upload-artifact@v4 - with: - name: web_files - path: ${{ runner.temp }}/gh-pages - retention-days: 1 - compression-level: 9 - name: Deploy to GitHub Pages if: github.ref == 'refs/heads/main' uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ${{ runner.temp }}/gh-pages - cname: starlike.orionzleon.me + cname: starlikeclient.com force_orphan: true user_name: 'github-actions[bot]' user_email: '41898282+github-actions[bot]@users.noreply.github.com' diff --git a/.gitignore b/.gitignore index 35c18af0..f2ba9bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ javascript/Starlike_Client_Offline_Signed.html.dat .metadata +GenerateBlocks.py +EaglerTools diff --git a/CompileEPK.sh b/CompileEPK.sh index b975a0d1..54d2afb6 100755 --- a/CompileEPK.sh +++ b/CompileEPK.sh @@ -1,2 +1,4 @@ #!/bin/sh +echo "compiling, please wait..." java -jar "desktopRuntime/CompileEPK.jar" "desktopRuntime/resources" "javascript/assets.epk" +echo "finished compiling epk" diff --git a/EAGLERCRAFTX_README.md b/EAGLERCRAFTX_README.md index f13ec9e7..60b70e45 100644 --- a/EAGLERCRAFTX_README.md +++ b/EAGLERCRAFTX_README.md @@ -158,6 +158,7 @@ The default eaglercraftXOpts values is this: - `demoMode:` whether to launch the game in java edition demo mode - `servers:` a list of default servers to display on the Multiplayer screen - `relays:` the default list of shared world relays to use for invites +- `checkGLErrors:` if the game should check for opengl errors - `checkShaderGLErrors:` enables more verbose opengl error logging for the shaders - `enableDownloadOfflineButton:` whether to show a "Download Offline" button on the title screen - `downloadOfflineButtonLink:` overrides the download link for the "Download Offline" button diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..31e0c3a4 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,33 @@ +# Starlike License + +Copyright (c) 2024 zumbiepig and SpeedSlicer + +## 1. Attribution + +If you use any part of this code in your project, you **must credit** the original author, zumbiepig and SpeedSlicer, in a clearly visible manner in both the project documentation and the software interface, including but not limited to: +- **Credits section** in documentation +- **Main menu or splash screen** within the application + +The **main menu** of the software or application **must not be changed** without written permission from zumbiepig and SpeedSlicer. + +## 2. Open Source Requirement for Derivative Works + +If you create any derivative work (a "fork") based on this project: +- You **must release the source code** of the derivative work under this same license, ensuring that all forks and modifications remain open source. +- You **must clearly state** that the original code is based on work by zumbiepig and SpeedSlicer. + +## 3. Restrictions + +- You are **not allowed to remove or alter any credits** to zumbiepig and SpeedSlicer in the code or the user interface. +- You **cannot distribute** any modified version of this code under a more restrictive license. +- Any attempts to circumvent or alter these licensing terms are strictly prohibited. + +## 4. Warranty Disclaimer + +This software is provided "as is", without any warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the author be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software. + +--- + +License written by HoosierTransfer + +By using this code, you agree to the terms of this license. diff --git a/SIGNED_CLIENT.env b/SIGNED_CLIENT.env index 95693cc7..9edfbe16 100644 --- a/SIGNED_CLIENT.env +++ b/SIGNED_CLIENT.env @@ -1,3 +1,3 @@ -SIGNED_CLIENT_INTEGER="202" -SIGNED_CLIENT_VERSION="0.2.2" -SIGNED_CLIENT_CHANGELOG="Mosaic bugfix" +SIGNED_CLIENT_INTEGER="300" +SIGNED_CLIENT_VERSION="0.3.0" +SIGNED_CLIENT_CHANGELOG="Find the changelog in the Discord server!" diff --git a/desktopRuntime/resources/EPKVersionIdentifier.txt b/desktopRuntime/resources/EPKVersionIdentifier.txt index f4778493..9325c3cc 100644 --- a/desktopRuntime/resources/EPKVersionIdentifier.txt +++ b/desktopRuntime/resources/EPKVersionIdentifier.txt @@ -1 +1 @@ -0.2.2 \ No newline at end of file +0.3.0 \ No newline at end of file diff --git a/desktopRuntime/resources/SignedBundleTemplate.txt b/desktopRuntime/resources/SignedBundleTemplate.txt index 7bcd8d32..f4941bec 100644 --- a/desktopRuntime/resources/SignedBundleTemplate.txt +++ b/desktopRuntime/resources/SignedBundleTemplate.txt @@ -10,7 +10,8 @@ if(typeof window !== "undefined") { }else { var relayzId = Math.floor(Math.random() * 3); window.eaglercraftXOpts = { - container: "game_frame" + container: "game_frame", + enableSignatureBadge: true }; } window.addEventListener("load", function() { diff --git a/desktopRuntime/resources/SignedClientTemplate.txt b/desktopRuntime/resources/SignedClientTemplate.txt index 21d99a1d..f5914cff 100644 --- a/desktopRuntime/resources/SignedClientTemplate.txt +++ b/desktopRuntime/resources/SignedClientTemplate.txt @@ -17,7 +17,8 @@ window.eaglercraftXOptsHints = { hintsVersion: 1, - container: "game_frame" + container: "game_frame", + enableSignatureBadge: true }; // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/desktopRuntime/resources/assets/eagler/CREDITS.txt b/desktopRuntime/resources/assets/eagler/CREDITS.txt index 943a6385..6311f61b 100644 --- a/desktopRuntime/resources/assets/eagler/CREDITS.txt +++ b/desktopRuntime/resources/assets/eagler/CREDITS.txt @@ -1,4 +1,14 @@ + Starlike Client + ~~~~~~~~~~~~~~~~~~~~~~~ + + - SpeedSlicer - Owner + - zumbiepig - Co-Owner + - CatFoolYou - Texture artist + - Oeil-de-Lynx - Contributor + + + EaglercraftX Developers ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt index 16cdffdc..7d514454 100644 --- a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt +++ b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt @@ -31,24 +31,25 @@ "forceWebViewSupport": false, "enableServerCookies": true, "enableDownloadOfflineButton": true, - "downloadOfflineButtonLink": "https://starlike.orionzleon.me/offline.html", + "downloadOfflineButtonLink": null, "resourcePacksDB": "resourcePacks_starlike", "enableWebViewCSP": true, "checkRelaysForUpdates": true, "allowServerRedirects": true, "allowUpdateSvc": true, - "html5CursorSupport": true, + "html5CursorSupport": false, "allowFNAWSkins": true, "allowVoiceClient": true, "worldsDB": "worlds_starlike", "demoMode": false, "localStorageNamespace": "_eaglercraftX_starlike", - "enableSignatureBadge": true, + "enableSignatureBadge": false, "lang": "en_US", "enableMinceraft": true, "autoFixLegacyStyleAttr": true, "allowUpdateDL": true, "logInvalidCerts": true, + "checkGLErrors": false, "checkShaderGLErrors": false, "crashOnUncaughtExceptions": false, "forceWebGL1": false, diff --git a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang index 8589d53f..50b0f866 100644 --- a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang +++ b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang @@ -718,24 +718,24 @@ tile.ice.name=Ice tile.icePacked.name=Packed Ice tile.cactus.name=Cactus tile.clay.name=Clay -tile.clayHardenedStained.name=Stained Clay -tile.clayHardenedStained.black.name=Black Stained Clay -tile.clayHardenedStained.red.name=Red Stained Clay -tile.clayHardenedStained.green.name=Green Stained Clay -tile.clayHardenedStained.brown.name=Brown Stained Clay -tile.clayHardenedStained.blue.name=Blue Stained Clay -tile.clayHardenedStained.purple.name=Purple Stained Clay -tile.clayHardenedStained.cyan.name=Cyan Stained Clay -tile.clayHardenedStained.silver.name=Light Gray Stained Clay -tile.clayHardenedStained.gray.name=Gray Stained Clay -tile.clayHardenedStained.pink.name=Pink Stained Clay -tile.clayHardenedStained.lime.name=Lime Stained Clay -tile.clayHardenedStained.yellow.name=Yellow Stained Clay -tile.clayHardenedStained.lightBlue.name=Light Blue Stained Clay -tile.clayHardenedStained.magenta.name=Magenta Stained Clay -tile.clayHardenedStained.orange.name=Orange Stained Clay -tile.clayHardenedStained.white.name=White Stained Clay -tile.clayHardened.name=Hardened Clay +tile.clayHardenedStained.name=Terracotta +tile.clayHardenedStained.black.name=Black Terracotta +tile.clayHardenedStained.red.name=Red Terracotta +tile.clayHardenedStained.green.name=Green Terracotta +tile.clayHardenedStained.brown.name=Brown Terracotta +tile.clayHardenedStained.blue.name=Blue Terracotta +tile.clayHardenedStained.purple.name=Purple Terracotta +tile.clayHardenedStained.cyan.name=Cyan Terracotta +tile.clayHardenedStained.silver.name=Light Gray Terracotta +tile.clayHardenedStained.gray.name=Gray Terracotta +tile.clayHardenedStained.pink.name=Pink Terracotta +tile.clayHardenedStained.lime.name=Lime Terracotta +tile.clayHardenedStained.yellow.name=Yellow Terracotta +tile.clayHardenedStained.lightBlue.name=Light Blue Terracotta +tile.clayHardenedStained.magenta.name=Magenta Terracotta +tile.clayHardenedStained.orange.name=Orange Terracotta +tile.clayHardenedStained.white.name=White Terracotta +tile.clayHardened.name=Terracotta tile.reeds.name=Sugar cane tile.jukebox.name=Jukebox tile.fence.name=Oak Fence @@ -1912,7 +1912,7 @@ itemGroup.search=Search Items itemGroup.food=Foodstuffs itemGroup.tools=Tools itemGroup.combat=Combat -itemGroup.brewing=Brewing +itemGroup.brewing=Consumables itemGroup.materials=Materials itemGroup.inventory=Survival Inventory diff --git a/desktopRuntime/resources/assets/minecraft/texts/splashes.txt b/desktopRuntime/resources/assets/minecraft/texts/splashes.txt index a65eb626..efa159e1 100644 --- a/desktopRuntime/resources/assets/minecraft/texts/splashes.txt +++ b/desktopRuntime/resources/assets/minecraft/texts/splashes.txt @@ -1,427 +1,129 @@ -As seen on TV! -Awesome! -100% pure! -May contain nuts! -More polygons! -Moderately attractive! -Limited edition! -Flashing letters! -It's here! -Best in class! -It's finished! -Kind of dragon free! -Excitement! -More than 500 sold! -One of a kind! -Heaps of hits on YouTube! -Indev! -Spiders everywhere! -Check it out! -Holy cow, man! -It's a game! -Made in Sweden! -Uses LWJGL! -Reticulating splines! -Minecraft! -Yaaay! -Singleplayer! -Keyboard compatible! -Ingots! -Exploding creepers! -That's no moon! -l33t! -Create! -Survive! -Dungeon! -Exclusive! -The bee's knees! -Closed source! -Classy! -Wow! -Not on steam! -Oh man! -Awesome community! -Pixels! -Teetsuuuuoooo! -Kaaneeeedaaaa! -Now with difficulty! -Enhanced! -90% bug free! -Pretty! -12 herbs and spices! -Fat free! -Absolutely no memes! -Free dental! -Ask your doctor! -Minors welcome! -Cloud computing! -Legal in Finland! -Hard to label! -Technically good! -Bringing home the bacon! -Indie! -GOTY! -Ceci n'est pas une title screen! -Euclidian! -Now in 3D! -Inspirational! -Herregud! -Complex cellular automata! -Yes, sir! -Played by cowboys! -Now on OpenGL 3.2 core profile! -Thousands of colors! -Try it! -Age of Wonders is better! -Try the mushroom stew! -Sensational! -Hot tamale, hot hot tamale! -Play him off, keyboard cat! -Guaranteed! -Macroscopic! -Bring it on! -Random splash! -Call your mother! -Monster infighting! -Loved by millions! -Ultimate edition! -Freaky! -You've got a brand new key! -Water proof! -Uninflammable! -Whoa, dude! -All inclusive! -Tell your friends! -NP is not in P! -Music by C418! -Livestreamed! -Haunted! -Polynomial! -Terrestrial! -All is full of love! -Full of stars! -Scientific! -Not as cool as Spock! -Collaborate and listen! -Never dig down! -Take frequent breaks! -Not linear! -Han shot first! -Nice to meet you! -Buckets of lava! -Ride the pig! -Larger than Earth! -sqrt(-1) love you! -Phobos anomaly! -Punching wood! -Falling off cliffs! -1% sugar! -150% hyperbole! -Synecdoche! -Let's danec! -Seecret Friday update! -Reference implementation! -Kiss the sky! -20 GOTO 10! -Verlet intregration! -Peter Griffin! -Do not distribute! -Cogito ergo sum! -4815162342 lines of code! -A skeleton popped out! -The sum of its parts! -BTAF used to be good! -I miss ADOM! -umop-apisdn! -OICU812! -Bring me Ray Cokes! -Finger-licking! -Thematic! -Pneumatic! -Sublime! -Octagonal! -Une baguette! -Gargamel plays it! -Rita is the new top dog! -SWM forever! -Representing Edsbyn! -Matt Damon! -Supercalifragilisticexpialidocious! -Consummate V's! -Cow Tools! -Double buffered! -Fan fiction! -Flaxkikare! -Jason! Jason! Jason! -Hotter than the sun! -Internet enabled! -Autonomous! -Engage! -Fantasy! -DRR! DRR! DRR! -Kick it root down! -Regional resources! -Woo, facepunch! -Woo, somethingawful! -Woo, tigsource! -Woo, worldofminecraft! -Woo, reddit! -Woo, 2pp! -Google anlyticsed! -Now supports åäö! -Give us Gordon! -Tip your waiter! -Very fun! -12345 is a bad password! -Vote for net neutrality! -Lives in a pineapple under the sea! -MAP11 has two names! -Omnipotent! -Gasp! -...! -Bees, bees, bees, bees! -Jag känner en bot! -This text is hard to read if you play the game at the default resolution, but at 1080p it's fine! -Haha, LOL! -Hampsterdance! -Menger sponge! -idspispopd! -Eple (original edit)! -So fresh, so clean! -Slow acting portals! -Try the Nether! -Don't look directly at the bugs! -Oh, ok, Pigmen! -Finally with ladders! -Scary! -Play Minecraft, Watch Topgear, Get Pig! -Twittered about! -Jump up, jump up, and get down! -Joel is neat! -A riddle, wrapped in a mystery! -This parrot is no more! It has ceased to be! -Welcome to your Doom! -Stay a while, stay forever! -Stay a while and listen! -Treatment for your rash! -"Autological" is! -Information wants to be free! -"Almost never" is an interesting concept! -Lots of truthiness! -The creeper is a spy! -Turing complete! -It's groundbreaking! -Let our battle's begin! -The sky is the limit! -Jeb has amazing hair! -Ryan also has amazing hair! -Casual gaming! -Undefeated! -Kinda like Lemmings! -Follow the train, CJ! -Leveraging synergy! -This message will never appear on the splash screen, isn't that weird? -DungeonQuest is unfair! -90210! -Check out the far lands! -Tyrion would love it! -Also try VVVVVV! -Also try Super Meat Boy! -Also try Terraria! -Also try Mount And Blade! -Also try Project Zomboid! -Also try World of Goo! -Also try Limbo! -Also try Pixeljunk Shooter! -Also try Braid! -That's super! -Bread is pain! -Read more books! -Khaaaaaaaaan! -Less addictive than TV Tropes! -More addictive than lemonade! -Bigger than a bread box! -Millions of peaches! -Fnord! -This is my true form! -Don't bother with the clones! -Pumpkinhead! -Made by Jeb! -Has an ending! -Finally complete! -Feature packed! -Boots with the fur! -Stop, hammertime! -Testificates! -Conventional! -Homeomorphic to a 3-sphere! -Doesn't avoid double negatives! -Place ALL the blocks! -Does barrel rolls! -Meeting expectations! -PC gaming since 1873! -Ghoughpteighbteau tchoghs! -Déjà vu! -Déjà vu! -Got your nose! -Haley loves Elan! -Afraid of the big, black bat! -Doesn't use the U-word! -Child's play! -See you next Friday or so! -From the streets of Södermalm! -150 bpm for 400000 minutes! -Technologic! -Funk soul brother! -Pumpa kungen! -日本ハロー！ -한국 안녕하세요! -Helo Cymru! -Cześć Polsko! -你好中国！ -Привет Россия! -Γεια σου Ελλάδα! -My life for Aiur! -Lennart lennart = new Lennart(); -I see your vocabulary has improved! -Who put it there? -You can't explain that! -if not ok then return end -§1C§2o§3l§4o§5r§6m§7a§8t§9i§ac -§kFUNKY LOL -Big Pointy Teeth! -Bekarton guards the gate! -Mmmph, mmph! -Don't feed avocados to parrots! -Swords for everyone! -Plz reply to my tweet! -.party()! -Take her pillow! -Put that cookie down! -Pretty scary! -I have a suggestion. -Now with extra hugs! -Java 16 + 1 = 17! -Woah. -HURNERJSGER? -What's up, Doc? -Now contains 32 random daily cats! -That's Numberwang! -pls rt -Do you want to join my server? -Put a little fence around it! -Throw a blanket over it! -One day, somewhere in the future, my work will be quoted! -Now with additional stuff! -Extra things! -Yay, puppies for everyone! -So sweet, like a nice bon bon! -Very influential in its circle! -Now With Multiplayer! -Rise from your grave! -Warning! A huge battleship "STEVE" is approaching fast! -Blue warrior shot the food! -Run, coward! I hunger! -Flavor with no seasoning! -Strange, but not a stranger! -Tougher than diamonds, rich like cream! -It swings, it jives! -Cruising streets for gold! -Take an eggbeater and beat it against a skillet! -Make me a table, a funky table! -Take the elevator to the mezzanine! -Stop being reasonable, this is the Internet! -/give @a hugs 64 -This is good for Realms. -Any computer is a laptop if you're brave enough! -Do it all, everything! -Where there is not light, there can spider! -GNU Terry Pratchett -More Digital! -doot doot -Falling with style! -There's no stopping the Trollmaso -Throw yourself at the ground and miss -Rule #1: it's never my fault -Replaced molten cheese with blood? -Absolutely fixed relatively broken coordinates -Boats FTW -Javalicious edition -Should not be played while driving -You're going too fast! -Don't feed chocolate to parrots! -The true meaning of covfefe -An illusion! What are you hiding? -Something's not quite right... -Thank you for the fish! -All rumors are true! -Truly gone fishing! -Rainbow turtle? -Something funny! -I need more context. -Ahhhhhh! -Don't worry, be happy! -Water bottle! -What's the question? -Plant a tree! -Go to the dentist! -What do you expect? -Look mum, I'm in a splash! -It came from space. -Awesome game design right there! -Ph1lza had a good run! -10 years of Mining and Crafting! -Ping the human! -In case it isn't obvious, foxes aren't players. -Buzzy Bees! -Minecraft Java Edition presents: Disgusting Bugs -Wash your hands! -Soap and water! -Support local businesses! -Stay home and play games! -Stay safe! -Stay strong! -Cough or sneeze into your elbow! -Don’t touch your face! -Support elderly relatives and friends! -Prepare, but don’t hoard! -Gamers unite – separately in your own homes! -Save the world – stay inside! -Shop for your elders! -Hang out with your friends online! -Honey, I grew the bees! -Find your claw! -Everybody do the Leif! -<3 Max & 99 & Ducky! -Bushy eyebrows! -Edit is a name! -From free range developers! -Music by Lena Raine! -Aww man! -#minecraftfarms -And my pickaxe! -Envision! Create! Share! -Fabulous graphics! -Also try Minecraft Dungeons! -Vanilla! -May contain traces of citrus! -Zoglin!? -Black lives matter! -Be anti-racist! -Learn about allyship! -Speak OUT against injustice and UP for equality! -Amplify and listen to BIPOC voices! -Educate your friends on anti-racism! -Support the BIPOC community and creators! -Stand up for equality in your community! -[this splash text is now available] -Contains simulated goats! -Home-made! -There's <:) +Dinnerbone +Diddy bone +Ain't no party like a Diddy Party! +Sharing is caring! (unless its an std) +im gonna stop deleting messages +Bigger than 2 inches! +alr added +Please Enjoy Nice Intimate Situations +>:) +this without the space ^ +:D +"Im NOT pulling out" +opera is the best browser ever +DIDDY DIDNT DO IT! +Freak off in 30 mins +i wanna join +Mom said it was my turn on the xbox +what's the wifi password +ill check this in about 30-60 min +bruh +I like turtles +nigga +They hit the north tower +Shut it +stop the pings1!1! +Delete system32 +reverse yeeing +Hot single moms in your area +interpropriate +i've seen your search history. +Hey kid, you want free candy? +clicked on it +9+10=21 +i didn't know she was 16 +What's this white stuff? +Is it just me, or are half of these splash texts deranged? +teacher is coming +https://blocked.goguardian.com/ +"Im sorry she didnt make it" +includes bonzi buddy +bro wake up its 2014 +thick of it +How thick? +Hey everyone, Dan here from The Diamond Minecart +f to pay respects to zumbiepig for reviewing this full chat +I love touching zumbies boosums +https://www.reddit.com/r/eaglercraft/ +FIEN FIEN FIEN +No 😭 +rizz mode deactivated +Dog eating cake in da frige +Why did Microsoft buy Minecraft for 2.5 Billion Dollars when they could have bought it for 30$? +"According to all known laws of aviation, there is no way a bee should be able to fly. Its wings are too small to get its fat little body off the ground. The bee, of course, flies anyway because bees don't care what humans think is impossible." (We don't even have bees) +🤓 🖕 +i failed my art class, expect evil to happen +#FREEDIDDY +Aged like milk +"can i milk you?" +punch a cow with a bucket +From the gyat, to sus, to the rizz, to the mew +paul eagler 2: the revival +mom, the eaglercraft discord got taken down again +Title screen splash text +once a skid, always a skid +Exercise? i thought u meant extra fries! +I FUCKNG hate curious George +i hate neigbors +#zumbie on talk tuah podcast +Lick Lick +This channel will close at 4:00PM (no this is not a splash). You will still be able to react after this time, so get your messages in! +Start spamming splash screen ideas +Peyton is gay +no spam +i've been sitting at my computer for 1 hour just saying splashes. +Group pissing in 5 mins +I haven't seen the outside world for 13 hours because I've been playing Minecraft. +touching grass? what a JOKE. +discord.gg/starlike +How many dicks can i fit in my mouth? +I'm gonna test that. +woah +HEEYY WHO DELETED THAT >:( +no fake members! +for christmas, i want jenny mod. +Jenny and Warden Hawk Tuah! +(╯°□°)╯︵ ┻━┻ +10 likes = my pfp be Zombie Pigman fr +Jfkxicjglckfhtldj +same rules, 5 👍 to get added +better than 1.8 +Justin Client +Simga! +george is skid +IM IN YOUR WALLS +Joy and Anxiety in a rap battle!! +skibidi toilet +8===D +5 likes +placeholder i forgot to remove lmao +¯\_(ツ)_/¯ +Make this a title screen splash +do i change to 4 👍 +Minecraftforfree.com +The Digital Millennium Copyright Act (DMCA) is a US law that protects copyright holders from online theft and infringement. +The Digital Millennium Copyright Act (DMCA) is a 1998 United States copyright law that implements two 1996 treaties of the World Intellectual Property Organization (WIPO). It criminalizes production and dissemination of technology, devices, or services intended to circumvent measures that control access to copyrighted works (commonly known as digital rights management or DRM). It also criminalizes the act of circumventing an access control, whether or not there is actual infringement of copyright itself. [citation needed] In addition, the DMCA heightens the penalties for copyright infringement on the Internet.[1][2] Passed on October 12, 1998, by a unanimous vote in the United States Senate and signed into law by President Bill Clinton on October 28, 1998, the DMCA amended Title 17 of the United States Code to extend the reach of copyright, while limiting the liability of the providers of online services for copyright infringement by their users. +funny splash +Oiled up? +lax1dude vs microsoft +Hi everyone - random discord person +gg +get this to 4 likes guys \ No newline at end of file diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/enable_blur.txt b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/enable_blur.txt index ff73acbb..3c229751 100644 --- a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/enable_blur.txt +++ b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/enable_blur.txt @@ -1,2 +1,2 @@ # Change to 0 to disable blur -enable_blur=1 \ No newline at end of file +enable_blur=0 \ No newline at end of file diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_0.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_0.png index 1c388329..49420874 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_0.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_0.png differ diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_1.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_1.png index eb0040ac..e753018a 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_1.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_1.png differ diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_2.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_2.png index 554d2a3b..1c7a7aca 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_2.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_2.png differ diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_3.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_3.png index 7711624e..358d13d0 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_3.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_3.png differ diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_4.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_4.png index 6bbcd5ca..f3840e08 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_4.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_4.png differ diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_5.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_5.png index 9d667a1e..611957e0 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_5.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/background/panorama_5.png differ diff --git a/desktopRuntime/resources/assets/minecraft/textures/gui/title/minecraft.png b/desktopRuntime/resources/assets/minecraft/textures/gui/title/minecraft.png index 832c132f..65e4ae90 100644 Binary files a/desktopRuntime/resources/assets/minecraft/textures/gui/title/minecraft.png and b/desktopRuntime/resources/assets/minecraft/textures/gui/title/minecraft.png differ diff --git a/desktopRuntime/resources/assets/starlike/blockstates/ancient_debris.json b/desktopRuntime/resources/assets/starlike/blockstates/ancient_debris.json new file mode 100644 index 00000000..522c0a92 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/ancient_debris.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:ancient_debris" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/andesite_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/andesite_bricks.json new file mode 100644 index 00000000..00922460 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/andesite_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:andesite_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/andesite_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/andesite_tiles.json new file mode 100644 index 00000000..1c783e41 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/andesite_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:andesite_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/black_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/black_glazed_terracotta.json new file mode 100644 index 00000000..81de01fa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/black_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:black_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/black_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/black_packed_terracotta.json new file mode 100644 index 00000000..40c2c3ba --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/black_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:black_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/black_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/black_planks.json new file mode 100644 index 00000000..7b93dbdb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/black_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:black_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/black_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/black_terracotta_bricks.json new file mode 100644 index 00000000..4bdd2a15 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/black_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:black_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/blackstone.json b/desktopRuntime/resources/assets/starlike/blockstates/blackstone.json new file mode 100644 index 00000000..df54310e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:blackstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/blue_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/blue_glazed_terracotta.json new file mode 100644 index 00000000..9298e1c1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/blue_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:blue_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/blue_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/blue_packed_terracotta.json new file mode 100644 index 00000000..1a01ca8a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/blue_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:blue_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/blue_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/blue_planks.json new file mode 100644 index 00000000..d1a76ebd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/blue_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:blue_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/blue_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/blue_terracotta_bricks.json new file mode 100644 index 00000000..79d7b3fe --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/blue_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:blue_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/brown_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/brown_glazed_terracotta.json new file mode 100644 index 00000000..8c208865 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/brown_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:brown_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/brown_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/brown_packed_terracotta.json new file mode 100644 index 00000000..3517ff81 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/brown_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:brown_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/brown_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/brown_planks.json new file mode 100644 index 00000000..4b7d99de --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/brown_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:brown_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/brown_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/brown_terracotta_bricks.json new file mode 100644 index 00000000..2a249f8c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/brown_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:brown_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/calcite.json b/desktopRuntime/resources/assets/starlike/blockstates/calcite.json new file mode 100644 index 00000000..efb946f1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/calcite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:calcite" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/calcite_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/calcite_tiles.json new file mode 100644 index 00000000..b3f96e22 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/calcite_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:calcite_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_acacia_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_acacia_planks.json new file mode 100644 index 00000000..fb767002 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_acacia_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_acacia_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_bamboo_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_bamboo_planks.json new file mode 100644 index 00000000..59c7dd96 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_bamboo_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_bamboo_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_birch_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_birch_planks.json new file mode 100644 index 00000000..c9b900a7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_birch_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_birch_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_cherry_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_cherry_planks.json new file mode 100644 index 00000000..7e740061 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_cherry_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_cherry_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_copper.json new file mode 100644 index 00000000..8f6c678b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_crimson_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_crimson_planks.json new file mode 100644 index 00000000..010ea82f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_crimson_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_crimson_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_dark_oak_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_dark_oak_planks.json new file mode 100644 index 00000000..f45310b6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_dark_oak_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_dark_oak_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_deep_ocean_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_deep_ocean_bricks.json new file mode 100644 index 00000000..f1b20090 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_deep_ocean_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_deep_ocean_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_jungle_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_jungle_planks.json new file mode 100644 index 00000000..704af82c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_jungle_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_jungle_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_mangrove_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_mangrove_planks.json new file mode 100644 index 00000000..7445bf50 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_mangrove_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_mangrove_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_oak_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_oak_planks.json new file mode 100644 index 00000000..c39af794 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_oak_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_oak_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_polished_blackstone.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_polished_blackstone.json new file mode 100644 index 00000000..f1fa5f49 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_polished_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_polished_blackstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_spruce_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_spruce_planks.json new file mode 100644 index 00000000..bc0c1d8a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_spruce_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_spruce_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff.json new file mode 100644 index 00000000..519ea4f7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_tuff" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff_bricks.json new file mode 100644 index 00000000..940dbaf3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_tuff_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff_top.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff_top.json new file mode 100644 index 00000000..9e26f740 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_tuff_top.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_tuff_top" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/chiseled_warped_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_warped_planks.json new file mode 100644 index 00000000..08da0565 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/chiseled_warped_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:chiseled_warped_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_andesite.json b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_andesite.json new file mode 100644 index 00000000..3cf63494 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_andesite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cobbled_andesite" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_deepslate.json b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_deepslate.json new file mode 100644 index 00000000..f45b83c2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_deepslate.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "starlike:cobbled_deepslate" } + } +} diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_deepstone.json b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_deepstone.json deleted file mode 100644 index 1114477a..00000000 --- a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_deepstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "starlike:cobbled_deepstone" } - } -} diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_diorite.json b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_diorite.json new file mode 100644 index 00000000..7da9a9fb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_diorite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cobbled_diorite" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_granite.json b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_granite.json new file mode 100644 index 00000000..3c8961c8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_granite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cobbled_granite" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cobbled_soul_stone.json b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_soul_stone.json new file mode 100644 index 00000000..4bca40b9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cobbled_soul_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cobbled_soul_stone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/copper.json b/desktopRuntime/resources/assets/starlike/blockstates/copper.json new file mode 100644 index 00000000..2598c86d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/copper_block.json b/desktopRuntime/resources/assets/starlike/blockstates/copper_block.json new file mode 100644 index 00000000..e9a22369 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/copper_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:copper_block" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/copper_grate.json b/desktopRuntime/resources/assets/starlike/blockstates/copper_grate.json new file mode 100644 index 00000000..2cce5139 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/copper_grate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:copper_grate" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/copper_ore.json b/desktopRuntime/resources/assets/starlike/blockstates/copper_ore.json new file mode 100644 index 00000000..4c74a9fd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/copper_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:copper_ore" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cracked_blackstone.json b/desktopRuntime/resources/assets/starlike/blockstates/cracked_blackstone.json new file mode 100644 index 00000000..82c06664 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cracked_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cracked_blackstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cracked_polished_blackstone_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/cracked_polished_blackstone_bricks.json new file mode 100644 index 00000000..ff30c3af --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cracked_polished_blackstone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cracked_polished_blackstone_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/creeper_chiseled_sandstone.json b/desktopRuntime/resources/assets/starlike/blockstates/creeper_chiseled_sandstone.json new file mode 100644 index 00000000..962ecc7b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/creeper_chiseled_sandstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:creeper_chiseled_sandstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cut_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/cut_copper.json new file mode 100644 index 00000000..d9d2d6d2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cut_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cut_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cyan_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/cyan_glazed_terracotta.json new file mode 100644 index 00000000..a8bd55f5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cyan_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cyan_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cyan_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/cyan_packed_terracotta.json new file mode 100644 index 00000000..7305d62f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cyan_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cyan_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cyan_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/cyan_planks.json new file mode 100644 index 00000000..9ef46ebe --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cyan_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cyan_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/cyan_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/cyan_terracotta_bricks.json new file mode 100644 index 00000000..5273fdb7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/cyan_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:cyan_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_acacia_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_acacia_log.json new file mode 100644 index 00000000..522f2f1c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_acacia_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_acacia_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_acacia_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_acacia_planks.json new file mode 100644 index 00000000..acbbcd7f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_acacia_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_acacia_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_birch_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_birch_log.json new file mode 100644 index 00000000..6757803f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_birch_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_birch_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_birch_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_birch_planks.json new file mode 100644 index 00000000..b48a54c4 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_birch_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_birch_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_dark_oak_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_dark_oak_log.json new file mode 100644 index 00000000..e44f5691 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_dark_oak_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_dark_oak_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_dark_oak_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_dark_oak_planks.json new file mode 100644 index 00000000..08132c2e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_dark_oak_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_dark_oak_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_jungle_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_jungle_log.json new file mode 100644 index 00000000..50893201 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_jungle_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_jungle_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_jungle_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_jungle_planks.json new file mode 100644 index 00000000..5809cefc --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_jungle_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_jungle_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_oak_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_oak_log.json new file mode 100644 index 00000000..d6e95a58 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_oak_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_oak_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_oak_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_oak_planks.json new file mode 100644 index 00000000..7543bb3d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_oak_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_oak_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_red_sandstone.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_red_sandstone.json new file mode 100644 index 00000000..d5dfa8a6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_red_sandstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_red_sandstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_sandstone.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_sandstone.json new file mode 100644 index 00000000..07434a47 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_sandstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_sandstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_spruce_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_spruce_log.json new file mode 100644 index 00000000..ae5eb50d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_spruce_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_spruce_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_spruce_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_spruce_planks.json new file mode 100644 index 00000000..30bf43e6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_spruce_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_spruce_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_acacia_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_acacia_log.json new file mode 100644 index 00000000..757d3673 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_acacia_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_stripped_acacia_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_birch_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_birch_log.json new file mode 100644 index 00000000..eaf60500 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_birch_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_stripped_birch_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_dark_oak_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_dark_oak_log.json new file mode 100644 index 00000000..f90f7c0c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_dark_oak_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_stripped_dark_oak_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_jungle_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_jungle_log.json new file mode 100644 index 00000000..5bfb2178 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_jungle_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_stripped_jungle_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_oak_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_oak_log.json new file mode 100644 index 00000000..78e44df7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_oak_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_stripped_oak_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_spruce_log.json b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_spruce_log.json new file mode 100644 index 00000000..75f3671d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/decorated_stripped_spruce_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:decorated_stripped_spruce_log" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/deep_ocean_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/deep_ocean_bricks.json new file mode 100644 index 00000000..43b1aa20 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/deep_ocean_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:deep_ocean_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/deepslate.json b/desktopRuntime/resources/assets/starlike/blockstates/deepslate.json new file mode 100644 index 00000000..d40b3b82 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/deepslate.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "starlike:deepslate" } + } +} diff --git a/desktopRuntime/resources/assets/starlike/blockstates/deepslate_copper_ore.json b/desktopRuntime/resources/assets/starlike/blockstates/deepslate_copper_ore.json new file mode 100644 index 00000000..fca2361d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/deepslate_copper_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:deepslate_copper_ore" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/deepstone.json b/desktopRuntime/resources/assets/starlike/blockstates/deepstone.json deleted file mode 100644 index 7249171e..00000000 --- a/desktopRuntime/resources/assets/starlike/blockstates/deepstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "starlike:deepstone" } - } -} diff --git a/desktopRuntime/resources/assets/starlike/blockstates/diorite_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/diorite_tiles.json new file mode 100644 index 00000000..3d370216 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/diorite_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:diorite_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/dragonite_block.json b/desktopRuntime/resources/assets/starlike/blockstates/dragonite_block.json new file mode 100644 index 00000000..7dc03986 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/dragonite_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "starlike:dragonite_block" } + } +} diff --git a/desktopRuntime/resources/assets/starlike/blockstates/exposed_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/exposed_chiseled_copper.json new file mode 100644 index 00000000..11e69d9e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/exposed_chiseled_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:exposed_chiseled_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/exposed_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/exposed_copper.json new file mode 100644 index 00000000..b9cfe289 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/exposed_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:exposed_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/exposed_copper_grate.json b/desktopRuntime/resources/assets/starlike/blockstates/exposed_copper_grate.json new file mode 100644 index 00000000..d88c64fd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/exposed_copper_grate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:exposed_copper_grate" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/exposed_cut_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/exposed_cut_copper.json new file mode 100644 index 00000000..c6472882 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/exposed_cut_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:exposed_cut_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/ghast_chiseled_quartz_block.json b/desktopRuntime/resources/assets/starlike/blockstates/ghast_chiseled_quartz_block.json new file mode 100644 index 00000000..7939918d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/ghast_chiseled_quartz_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:ghast_chiseled_quartz_block" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/gilded_blackstone.json b/desktopRuntime/resources/assets/starlike/blockstates/gilded_blackstone.json new file mode 100644 index 00000000..1a536c02 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/gilded_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:gilded_blackstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/gold_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/gold_tiles.json new file mode 100644 index 00000000..25b1951a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/gold_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:gold_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/gray_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/gray_glazed_terracotta.json new file mode 100644 index 00000000..26399411 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/gray_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:gray_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/gray_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/gray_packed_terracotta.json new file mode 100644 index 00000000..ad52bccf --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/gray_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:gray_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/gray_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/gray_planks.json new file mode 100644 index 00000000..012e0d02 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/gray_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:gray_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/gray_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/gray_terracotta_bricks.json new file mode 100644 index 00000000..ecfd2a85 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/gray_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:gray_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/green_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/green_glazed_terracotta.json new file mode 100644 index 00000000..ce25d352 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/green_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:green_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/green_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/green_packed_terracotta.json new file mode 100644 index 00000000..68794f77 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/green_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:green_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/green_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/green_planks.json new file mode 100644 index 00000000..3169f742 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/green_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:green_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/green_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/green_terracotta_bricks.json new file mode 100644 index 00000000..298a6ac2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/green_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:green_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/head_chiseled_deepslate.json b/desktopRuntime/resources/assets/starlike/blockstates/head_chiseled_deepslate.json new file mode 100644 index 00000000..336def92 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/head_chiseled_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:head_chiseled_deepslate" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_blue_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_glazed_terracotta.json new file mode 100644 index 00000000..70d7ba50 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_blue_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_blue_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_packed_terracotta.json new file mode 100644 index 00000000..d158d263 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_blue_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_blue_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_planks.json new file mode 100644 index 00000000..d60eab64 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_blue_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_blue_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_terracotta_bricks.json new file mode 100644 index 00000000..b70bc18f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_blue_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_blue_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_gray_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_glazed_terracotta.json new file mode 100644 index 00000000..567ee9d9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_gray_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_gray_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_packed_terracotta.json new file mode 100644 index 00000000..029089d1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_gray_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_gray_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_planks.json new file mode 100644 index 00000000..59c80207 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_gray_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/light_gray_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_terracotta_bricks.json new file mode 100644 index 00000000..13cd8433 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/light_gray_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:light_gray_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/lime_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/lime_glazed_terracotta.json new file mode 100644 index 00000000..aa1984b3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/lime_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:lime_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/lime_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/lime_packed_terracotta.json new file mode 100644 index 00000000..543ec12d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/lime_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:lime_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/lime_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/lime_planks.json new file mode 100644 index 00000000..df33d427 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/lime_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:lime_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/lime_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/lime_terracotta_bricks.json new file mode 100644 index 00000000..c5e91e1d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/lime_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:lime_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/limestone.json b/desktopRuntime/resources/assets/starlike/blockstates/limestone.json new file mode 100644 index 00000000..11f0ee80 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/limestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:limestone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/limestone_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/limestone_tiles.json new file mode 100644 index 00000000..1d902dae --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/limestone_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:limestone_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/magenta_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/magenta_glazed_terracotta.json new file mode 100644 index 00000000..3a50fb42 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/magenta_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:magenta_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/magenta_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/magenta_packed_terracotta.json new file mode 100644 index 00000000..d40b88d3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/magenta_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:magenta_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/magenta_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/magenta_planks.json new file mode 100644 index 00000000..535cdf29 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/magenta_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:magenta_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/magenta_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/magenta_terracotta_bricks.json new file mode 100644 index 00000000..55e42ead --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/magenta_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:magenta_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/netherite_block.json b/desktopRuntime/resources/assets/starlike/blockstates/netherite_block.json new file mode 100644 index 00000000..bf147db3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/netherite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:netherite_block" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/orange_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/orange_glazed_terracotta.json new file mode 100644 index 00000000..cde16830 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/orange_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:orange_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/orange_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/orange_packed_terracotta.json new file mode 100644 index 00000000..43d7e034 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/orange_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:orange_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/orange_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/orange_planks.json new file mode 100644 index 00000000..106beedc --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/orange_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:orange_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/orange_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/orange_terracotta_bricks.json new file mode 100644 index 00000000..91ebf762 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/orange_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:orange_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/ornate_red_sandstone.json b/desktopRuntime/resources/assets/starlike/blockstates/ornate_red_sandstone.json new file mode 100644 index 00000000..f39402aa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/ornate_red_sandstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:ornate_red_sandstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/ornate_sandstone.json b/desktopRuntime/resources/assets/starlike/blockstates/ornate_sandstone.json new file mode 100644 index 00000000..4a7716e2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/ornate_sandstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:ornate_sandstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/oxidized_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_chiseled_copper.json new file mode 100644 index 00000000..063cc9da --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_chiseled_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:oxidized_chiseled_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/oxidized_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_copper.json new file mode 100644 index 00000000..67ef0905 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:oxidized_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/oxidized_copper_grate.json b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_copper_grate.json new file mode 100644 index 00000000..4bd00395 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_copper_grate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:oxidized_copper_grate" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/oxidized_cut_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_cut_copper.json new file mode 100644 index 00000000..127d69e2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/oxidized_cut_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:oxidized_cut_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/packed_terracotta.json new file mode 100644 index 00000000..0853d8eb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/pink_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/pink_glazed_terracotta.json new file mode 100644 index 00000000..237cbff1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/pink_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:pink_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/pink_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/pink_packed_terracotta.json new file mode 100644 index 00000000..2a95ba19 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/pink_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:pink_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/pink_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/pink_planks.json new file mode 100644 index 00000000..bea706e2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/pink_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:pink_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/pink_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/pink_terracotta_bricks.json new file mode 100644 index 00000000..07db8b6e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/pink_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:pink_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/polished_andesite_brick.json b/desktopRuntime/resources/assets/starlike/blockstates/polished_andesite_brick.json new file mode 100644 index 00000000..3b7189a2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/polished_andesite_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:polished_andesite_brick" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/polished_blackstone.json b/desktopRuntime/resources/assets/starlike/blockstates/polished_blackstone.json new file mode 100644 index 00000000..84e9aa72 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/polished_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:polished_blackstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/polished_blackstone_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/polished_blackstone_bricks.json new file mode 100644 index 00000000..e6955a44 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/polished_blackstone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:polished_blackstone_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/polished_diorite_brick.json b/desktopRuntime/resources/assets/starlike/blockstates/polished_diorite_brick.json new file mode 100644 index 00000000..59125721 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/polished_diorite_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:polished_diorite_brick" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/polished_granite_brick.json b/desktopRuntime/resources/assets/starlike/blockstates/polished_granite_brick.json new file mode 100644 index 00000000..e314ee7e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/polished_granite_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:polished_granite_brick" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/polished_tuff.json b/desktopRuntime/resources/assets/starlike/blockstates/polished_tuff.json new file mode 100644 index 00000000..25ead49f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/polished_tuff.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:polished_tuff" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/purple_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/purple_glazed_terracotta.json new file mode 100644 index 00000000..6c37fe20 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/purple_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:purple_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/purple_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/purple_packed_terracotta.json new file mode 100644 index 00000000..1074b2d7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/purple_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:purple_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/purple_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/purple_planks.json new file mode 100644 index 00000000..4d8570aa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/purple_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:purple_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/purple_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/purple_terracotta_bricks.json new file mode 100644 index 00000000..7c1f9ee2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/purple_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:purple_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/raw_copper_block.json b/desktopRuntime/resources/assets/starlike/blockstates/raw_copper_block.json new file mode 100644 index 00000000..cf20eb81 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/raw_copper_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:raw_copper_block" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/red_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/red_glazed_terracotta.json new file mode 100644 index 00000000..2cc2bb2e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/red_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:red_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/red_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/red_packed_terracotta.json new file mode 100644 index 00000000..1357e7ba --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/red_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:red_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/red_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/red_planks.json new file mode 100644 index 00000000..1a34e448 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/red_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:red_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/red_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/red_terracotta_bricks.json new file mode 100644 index 00000000..138f56c8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/red_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:red_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/skeleton_chiseled_red_sandstone.json b/desktopRuntime/resources/assets/starlike/blockstates/skeleton_chiseled_red_sandstone.json new file mode 100644 index 00000000..97190ed6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/skeleton_chiseled_red_sandstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:skeleton_chiseled_red_sandstone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/smithing_table.json b/desktopRuntime/resources/assets/starlike/blockstates/smithing_table.json new file mode 100644 index 00000000..9efa7e94 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/smithing_table.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "starlike:smithing_table" } + } +} diff --git a/desktopRuntime/resources/assets/starlike/blockstates/smooth_basalt.json b/desktopRuntime/resources/assets/starlike/blockstates/smooth_basalt.json new file mode 100644 index 00000000..9c152f0f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/smooth_basalt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:smooth_basalt" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/soul_stone.json b/desktopRuntime/resources/assets/starlike/blockstates/soul_stone.json new file mode 100644 index 00000000..c96c1e7a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/soul_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:soul_stone" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/soul_stone_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/soul_stone_tiles.json new file mode 100644 index 00000000..b0068663 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/soul_stone_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:soul_stone_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/stone_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/stone_tiles.json new file mode 100644 index 00000000..4e3aaa47 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/stone_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:stone_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/terracotta_bricks.json new file mode 100644 index 00000000..26cff960 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/tuff.json b/desktopRuntime/resources/assets/starlike/blockstates/tuff.json new file mode 100644 index 00000000..f3824059 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/tuff.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:tuff" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/tuff_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/tuff_bricks.json new file mode 100644 index 00000000..7c90c2cb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/tuff_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:tuff_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/tuff_tiles.json b/desktopRuntime/resources/assets/starlike/blockstates/tuff_tiles.json new file mode 100644 index 00000000..7cbd1f9b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/tuff_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:tuff_tiles" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/weathered_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/weathered_chiseled_copper.json new file mode 100644 index 00000000..ac6ba489 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/weathered_chiseled_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:weathered_chiseled_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/weathered_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/weathered_copper.json new file mode 100644 index 00000000..100e0f65 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/weathered_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:weathered_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/weathered_copper_grate.json b/desktopRuntime/resources/assets/starlike/blockstates/weathered_copper_grate.json new file mode 100644 index 00000000..14ff41bd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/weathered_copper_grate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:weathered_copper_grate" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/weathered_cut_copper.json b/desktopRuntime/resources/assets/starlike/blockstates/weathered_cut_copper.json new file mode 100644 index 00000000..0598a137 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/weathered_cut_copper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:weathered_cut_copper" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/white_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/white_glazed_terracotta.json new file mode 100644 index 00000000..3e4e920c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/white_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:white_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/white_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/white_packed_terracotta.json new file mode 100644 index 00000000..15b4ac91 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/white_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:white_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/white_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/white_planks.json new file mode 100644 index 00000000..e9b6ae58 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/white_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:white_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/white_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/white_terracotta_bricks.json new file mode 100644 index 00000000..77391aff --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/white_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:white_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/yellow_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/yellow_glazed_terracotta.json new file mode 100644 index 00000000..5418eeff --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/yellow_glazed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:yellow_glazed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/yellow_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/blockstates/yellow_packed_terracotta.json new file mode 100644 index 00000000..538e96b2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/yellow_packed_terracotta.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:yellow_packed_terracotta" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/yellow_planks.json b/desktopRuntime/resources/assets/starlike/blockstates/yellow_planks.json new file mode 100644 index 00000000..3908f3b2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/yellow_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:yellow_planks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/yellow_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/yellow_terracotta_bricks.json new file mode 100644 index 00000000..1c83f462 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/yellow_terracotta_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:yellow_terracotta_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/blockstates/zombie_chiseled_stone_bricks.json b/desktopRuntime/resources/assets/starlike/blockstates/zombie_chiseled_stone_bricks.json new file mode 100644 index 00000000..4744ad62 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/blockstates/zombie_chiseled_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "starlike:zombie_chiseled_stone_bricks" + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/lang/en_US.lang b/desktopRuntime/resources/assets/starlike/lang/en_US.lang index 98ede7b7..75d7e287 100644 --- a/desktopRuntime/resources/assets/starlike/lang/en_US.lang +++ b/desktopRuntime/resources/assets/starlike/lang/en_US.lang @@ -1,15 +1,49 @@ itemGroup.starlike=Starlike +enchantment.level.11=XI +enchantment.level.12=XII +enchantment.level.13=XIII +enchantment.level.14=XIV +enchantment.level.15=XV +enchantment.level.16=XVI +enchantment.level.17=XVII +enchantment.level.18=XVIII +enchantment.level.19=XIX +enchantment.level.20=XX +enchantment.level.21=XXI +enchantment.level.22=XXII +enchantment.level.23=XXIII +enchantment.level.24=XXIV +enchantment.level.25=XXV +enchantment.level.26=XXVI +enchantment.level.27=XXVII +enchantment.level.28=XXVIII +enchantment.level.29=XXIX +enchantment.level.30=XXX + commands.gm.success.self=Set own game mode to %s commands.gm.success.other=Set %s's game mode to %s commands.gm.usage=/gm%s [player] -tile.deepstone.name=Deepstone -tile.cobbled_deepstone.name=Cobbled Deepstone +entity.NetherCreeper.name=Nether Creeper +entity.EndCreeper.name=End Creeper -item.steel.name=Steel -tile.steel_block.name=Steel Block -tile.steel_grate.name=Steel Grate +tile.deepslate.name=Deepslate +tile.cobbled_deepslate.name=Cobbled Deepslate + +tile.ancient_debris.name=Ancient Debris +tile.netherite_block.name=Block of Netherite +item.netherite_scrap.name=Netherite Scrap +item.netherite_ingot.name=Netherite Ingot +item.netherite_sword.name=Netherite Sword +item.netherite_shovel.name=Netherite Shovel +item.netherite_pickaxe.name=Netherite Pickaxe +item.netherite_axe.name=Netherite Axe +item.netherite_hoe.name=Netherite Hoe +item.netherite_helmet.name=Netherite Helmet +item.netherite_chestplate.name=Netherite Chestplate +item.netherite_leggings.name=Netherite Leggings +item.netherite_boots.name=Netherite Boots tile.platinum_ore.name=Platinum Ore tile.platinum_block.name=Platinum Block @@ -33,9 +67,17 @@ tile.uranium_block.name=Uranium Block item.uranium_crystal.name=Uranium Crystal item.uranium_rod.name=Uranium Rod +item.dragonite.name=Dragonite +tile.dragonite_block.name=Dragonite Block + item.platinum_drill.name=Platinum Drill item.titanium_drill.name=Titanium Drill +item.steel.name=Steel +tile.steel_block.name=Steel Block +tile.steel_grate.name=Steel Grate +item.chisel.name=Chisel + tile.mosaic.name=Mosaic tile.mosaic.oak.name=Oak Mosaic tile.mosaic.spruce.name=Spruce Mosaic @@ -43,4 +85,168 @@ tile.mosaic.birch.name=Birch Mosaic tile.mosaic.jungle.name=Jungle Mosaic tile.mosaic.acacia.name=Acacia Mosaic tile.mosaic.dark_oak.name=Dark Oak Mosaic -entity.NetherCreeper.name=Nether Creeper + +tile.smithing_table.name=Smithing Table +tile.fabricator.name=Fabricator + +tile.andesite_tiles.name=Andesite Tiles +tile.chiseled_deep_ocean_bricks.name=Chiseled Deep Ocean Bricks +tile.decorated_acacia_log.name=Decorated Acacia Log +tile.decorated_acacia_planks.name=Decorated Acacia Planks +tile.decorated_birch_log.name=Decorated Birch Log +tile.decorated_birch_planks.name=Decorated Birch Planks +tile.decorated_dark_oak_log.name=Decorated Dark Oak Log +tile.decorated_dark_oak_planks.name=Decorated Dark Oak Planks +tile.decorated_jungle_log.name=Decorated Jungle Log +tile.decorated_jungle_planks.name=Decorated Jungle Planks +tile.decorated_oak_log.name=Decorated Oak Log +tile.decorated_oak_planks.name=Decorated Oak Planks +tile.decorated_spruce_log.name=Decorated Spruce Log +tile.decorated_spruce_planks.name=Decorated Spruce Planks +tile.decorated_stripped_acacia_log.name=Decorated Stripped Acacia Log +tile.decorated_stripped_birch_log.name=Decorated Stripped Birch Log +tile.decorated_stripped_dark_oak_log.name=Decorated Stripped Dark Oak Log +tile.decorated_stripped_jungle_log.name=Decorated Stripped Jungle Log +tile.decorated_stripped_oak_log.name=Decorated Stripped Oak Log +tile.decorated_stripped_spruce_log.name=Decorated Stripped Spruce Log +tile.deep_ocean_bricks.name=Deep Ocean Bricks +tile.diorite_tiles.name=Diorite Tiles +tile.gold_tiles.name=Gold Tiles +tile.stone_tiles.name=Stone Tiles +tile.chiseled_copper.name=Chiseled Copper +tile.copper_block.name=Copper Block +tile.copper_grate.name=Copper Grate +tile.copper_ore.name=Copper Ore +tile.cut_copper.name=Cut Copper +tile.deepslate_copper_ore.name=Deepslate Copper Ore +tile.exposed_chiseled_copper.name=Exposed Chiseled Copper +tile.exposed_copper.name=Exposed Copper +tile.exposed_copper_grate.name=Exposed Copper Grate +tile.exposed_cut_copper.name=Exposed Cut Copper +tile.oxidized_chiseled_copper.name=Oxidized Chiseled Copper +tile.oxidized_copper.name=Oxidized Copper +tile.oxidized_copper_grate.name=Oxidized Copper Grate +tile.oxidized_cut_copper.name=Oxidized Cut Copper +tile.raw_copper.name=Raw Copper +tile.raw_copper_block.name=Raw Copper Block +tile.weathered_chiseled_copper.name=Weathered Chiseled Copper +tile.weathered_copper.name=Weathered Copper +tile.weathered_copper_grate.name=Weathered Copper Grate +tile.weathered_cut_copper.name=Weathered Cut Copper +item.copper_ingot.name=Copper Ingot +tile.creeper_chiseled_sandstone.name=Creeper Chiseled Sandstone +tile.ghast_chiseled_quartz_block.name=Ghast Chiseled Quartz Block +tile.head_chiseled_deepslate.name=Head Chiseled Deepslate +tile.skeleton_chiseled_red_sandstone.name=Skeleton Chiseled Red Sandstone +tile.zombie_chiseled_stone_bricks.name=Zombie Chiseled Stone Bricks +tile.andesite_bricks.name=Andesite Bricks +tile.black_glazed_terracotta.name=Black Glazed Terracotta +tile.black_packed_terracotta.name=Black Packed Terracotta +tile.black_terracotta_bricks.name=Black Terracotta Bricks +tile.blue_glazed_terracotta.name=Blue Glazed Terracotta +tile.blue_packed_terracotta.name=Blue Packed Terracotta +tile.blue_terracotta_bricks.name=Blue Terracotta Bricks +tile.brown_glazed_terracotta.name=Brown Glazed Terracotta +tile.brown_packed_terracotta.name=Brown Packed Terracotta +tile.brown_terracotta_bricks.name=Brown Terracotta Bricks +tile.cyan_glazed_terracotta.name=Cyan Glazed Terracotta +tile.cyan_packed_terracotta.name=Cyan Packed Terracotta +tile.cyan_terracotta_bricks.name=Cyan Terracotta Bricks +tile.gray_glazed_terracotta.name=Gray Glazed Terracotta +tile.gray_packed_terracotta.name=Gray Packed Terracotta +tile.gray_terracotta_bricks.name=Gray Terracotta Bricks +tile.green_glazed_terracotta.name=Green Glazed Terracotta +tile.green_packed_terracotta.name=Green Packed Terracotta +tile.green_terracotta_bricks.name=Green Terracotta Bricks +tile.light_blue_glazed_terracotta.name=Light Blue Glazed Terracotta +tile.light_blue_packed_terracotta.name=Light Blue Packed Terracotta +tile.light_blue_terracotta_bricks.name=Light Blue Terracotta Bricks +tile.light_gray_glazed_terracotta.name=Light Gray Glazed Terracotta +tile.light_gray_packed_terracotta.name=Light Gray Packed Terracotta +tile.light_gray_terracotta_bricks.name=Light Gray Terracotta Bricks +tile.lime_glazed_terracotta.name=Lime Glazed Terracotta +tile.lime_packed_terracotta.name=Lime Packed Terracotta +tile.lime_terracotta_bricks.name=Lime Terracotta Bricks +tile.magenta_glazed_terracotta.name=Magenta Glazed Terracotta +tile.magenta_packed_terracotta.name=Magenta Packed Terracotta +tile.magenta_terracotta_bricks.name=Magenta Terracotta Bricks +tile.orange_glazed_terracotta.name=Orange Glazed Terracotta +tile.orange_packed_terracotta.name=Orange Packed Terracotta +tile.orange_terracotta_bricks.name=Orange Terracotta Bricks +tile.packed_terracotta.name=Packed Terracotta +tile.pink_glazed_terracotta.name=Pink Glazed Terracotta +tile.pink_packed_terracotta.name=Pink Packed Terracotta +tile.pink_terracotta_bricks.name=Pink Terracotta Bricks +tile.purple_glazed_terracotta.name=Purple Glazed Terracotta +tile.purple_packed_terracotta.name=Purple Packed Terracotta +tile.purple_terracotta_bricks.name=Purple Terracotta Bricks +tile.red_glazed_terracotta.name=Red Glazed Terracotta +tile.red_packed_terracotta.name=Red Packed Terracotta +tile.red_terracotta_bricks.name=Red Terracotta Bricks +tile.terracotta_bricks.name=Terracotta Bricks +tile.white_glazed_terracotta.name=White Glazed Terracotta +tile.white_packed_terracotta.name=White Packed Terracotta +tile.white_terracotta_bricks.name=White Terracotta Bricks +tile.yellow_glazed_terracotta.name=Yellow Glazed Terracotta +tile.yellow_packed_terracotta.name=Yellow Packed Terracotta +tile.yellow_terracotta_bricks.name=Yellow Terracotta Bricks +tile.black_planks.name=Black Stained Planks +tile.blue_planks.name=Blue Stained Planks +tile.brown_planks.name=Brown Stained Planks +tile.cyan_planks.name=Cyan Stained Planks +tile.gray_planks.name=Gray Stained Planks +tile.green_planks.name=Green Stained Planks +tile.light_blue_planks.name=Light Blue Stained Planks +tile.light_gray_planks.name=Light Gray Stained Planks +tile.lime_planks.name=Lime Stained Planks +tile.magenta_planks.name=Magenta Stained Planks +tile.orange_planks.name=Orange Stained Planks +tile.pink_planks.name=Pink Stained Planks +tile.purple_planks.name=Purple Stained Planks +tile.red_planks.name=Red Stained Planks +tile.white_planks.name=White Stained Planks +tile.yellow_planks.name=Yellow Stained Planks +tile.decorated_red_sandstone.name=Decorated Red Sandstone +tile.decorated_sandstone.name=Decorated Sandstone +tile.ornate_red_sandstone.name=Ornate Red Sandstone +tile.ornate_sandstone.name=Ornate Sandstone +tile.cobbled_andesite.name=Cobbled Andesite +tile.cobbled_diorite.name=Cobbled Diorite +tile.cobbled_granite.name=Cobbled Granite +tile.polished_andesite_brick.name=Polished Andesite Brick +tile.polished_diorite_brick.name=Polished Diorite Brick +tile.polished_granite_brick.name=Polished Granite Brick +tile.chiseled_tuff.name=Chiseled Tuff +tile.chiseled_tuff_bricks.name=Chiseled Tuff Bricks +tile.chiseled_tuff_top.name=Chiseled Tuff Top +tile.polished_tuff.name=Polished Tuff +tile.tuff.name=Tuff +tile.tuff_bricks.name=Tuff Bricks +tile.blackstone.name=Blackstone +tile.chiseled_polished_blackstone.name=Chiseled Polished Blackstone +tile.cracked_blackstone.name=Cracked Blackstone +tile.cracked_polished_blackstone_bricks.name=Cracked Polished Blackstone Bricks +tile.gilded_blackstone.name=Gilded Blackstone +tile.polished_blackstone.name=Polished Blackstone +tile.polished_blackstone_bricks.name=Polished Blackstone Bricks +tile.andesite_tiles.name=Andesite Tiles +tile.calcite.name=Calcite +tile.calcite_tiles.name=Calcite Tiles +tile.chiseled_acacia_planks.name=Chiseled Acacia Planks +tile.chiseled_bamboo_planks.name=Chiseled Bamboo Planks +tile.chiseled_birch_planks.name=Chiseled Birch Planks +tile.chiseled_cherry_planks.name=Chiseled Cherry Planks +tile.chiseled_crimson_planks.name=Chiseled Crimson Planks +tile.chiseled_dark_oak_planks.name=Chiseled Dark Oak Planks +tile.chiseled_jungle_planks.name=Chiseled Jungle Planks +tile.chiseled_mangrove_planks.name=Chiseled Mangrove Planks +tile.chiseled_oak_planks.name=Chiseled Oak Planks +tile.chiseled_spruce_planks.name=Chiseled Spruce Planks +tile.chiseled_warped_planks.name=Chiseled Warped Planks +tile.cobbled_soul_stone.name=Cobbled Soul Stone +tile.limestone.name=Limestone +tile.limestone_tiles.name=Limestone Tiles +tile.smooth_basalt.name=Smooth Basalt +tile.soul_stone.name=Soul Stone +tile.soul_stone_tiles.name=Soul Stone Tiles +tile.tuff_tiles.name=Tuff Tiles diff --git a/desktopRuntime/resources/assets/starlike/models/block/ancient_debris.json b/desktopRuntime/resources/assets/starlike/models/block/ancient_debris.json new file mode 100644 index 00000000..ff8e7705 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/ancient_debris.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "starlike:blocks/ancient_debris_top", + "side": "starlike:blocks/ancient_debris_side" + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/block/andesite_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/andesite_bricks.json new file mode 100644 index 00000000..b75b87fa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/andesite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/andesite_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/andesite_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/andesite_tiles.json new file mode 100644 index 00000000..4b2a0d69 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/andesite_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/andesite_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/black_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/black_glazed_terracotta.json new file mode 100644 index 00000000..f05339b2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/black_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/black_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/black_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/black_packed_terracotta.json new file mode 100644 index 00000000..db89fa17 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/black_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/black_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/black_planks.json b/desktopRuntime/resources/assets/starlike/models/block/black_planks.json new file mode 100644 index 00000000..10ad746b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/black_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/black_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/black_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/black_terracotta_bricks.json new file mode 100644 index 00000000..78993114 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/black_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/black_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/blackstone.json b/desktopRuntime/resources/assets/starlike/models/block/blackstone.json new file mode 100644 index 00000000..2ae719fd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/blackstone.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "top": "starlike:blocks/cracked_blackstone", + "bottom": "starlike:blocks/cracked_blackstone", + "side": "starlike:blocks/blackstone" + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/block/blue_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/blue_glazed_terracotta.json new file mode 100644 index 00000000..e275e5b6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/blue_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/blue_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/blue_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/blue_packed_terracotta.json new file mode 100644 index 00000000..613e57de --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/blue_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/blue_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/blue_planks.json b/desktopRuntime/resources/assets/starlike/models/block/blue_planks.json new file mode 100644 index 00000000..f208c0e2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/blue_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/blue_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/blue_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/blue_terracotta_bricks.json new file mode 100644 index 00000000..fa01e9a5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/blue_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/blue_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/brown_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/brown_glazed_terracotta.json new file mode 100644 index 00000000..27bce386 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/brown_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/brown_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/brown_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/brown_packed_terracotta.json new file mode 100644 index 00000000..3ef86563 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/brown_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/brown_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/brown_planks.json b/desktopRuntime/resources/assets/starlike/models/block/brown_planks.json new file mode 100644 index 00000000..fc4b99fe --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/brown_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/brown_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/brown_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/brown_terracotta_bricks.json new file mode 100644 index 00000000..aaa62392 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/brown_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/brown_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/calcite.json b/desktopRuntime/resources/assets/starlike/models/block/calcite.json new file mode 100644 index 00000000..bcc84bd5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/calcite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/calcite" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/calcite_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/calcite_tiles.json new file mode 100644 index 00000000..429ddcb8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/calcite_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/calcite_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_acacia_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_acacia_planks.json new file mode 100644 index 00000000..afdca160 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_acacia_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_acacia_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_bamboo_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_bamboo_planks.json new file mode 100644 index 00000000..d97eb50f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_bamboo_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_bamboo_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_birch_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_birch_planks.json new file mode 100644 index 00000000..f8de7e2b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_birch_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_birch_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_cherry_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_cherry_planks.json new file mode 100644 index 00000000..c3fba062 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_cherry_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_cherry_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_copper.json new file mode 100644 index 00000000..2aa1e7de --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_crimson_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_crimson_planks.json new file mode 100644 index 00000000..2da0a3a3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_crimson_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_crimson_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_dark_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_dark_oak_planks.json new file mode 100644 index 00000000..f8994099 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_dark_oak_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_dark_oak_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_deep_ocean_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_deep_ocean_bricks.json new file mode 100644 index 00000000..5a8c30f1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_deep_ocean_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_deep_ocean_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_jungle_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_jungle_planks.json new file mode 100644 index 00000000..9c872531 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_jungle_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_jungle_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_mangrove_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_mangrove_planks.json new file mode 100644 index 00000000..3fedab2a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_mangrove_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_mangrove_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_oak_planks.json new file mode 100644 index 00000000..855711c0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_oak_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_oak_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_polished_blackstone.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_polished_blackstone.json new file mode 100644 index 00000000..58b87ec4 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_polished_blackstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_polished_blackstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_spruce_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_spruce_planks.json new file mode 100644 index 00000000..4063f77f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_spruce_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_spruce_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff.json new file mode 100644 index 00000000..a2dd7f8b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_tuff" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff_bricks.json new file mode 100644 index 00000000..59556653 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_tuff_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff_top.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff_top.json new file mode 100644 index 00000000..dd47491a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_tuff_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_tuff_top" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/chiseled_warped_planks.json b/desktopRuntime/resources/assets/starlike/models/block/chiseled_warped_planks.json new file mode 100644 index 00000000..87688a41 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/chiseled_warped_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/chiseled_warped_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cobbled_andesite.json b/desktopRuntime/resources/assets/starlike/models/block/cobbled_andesite.json new file mode 100644 index 00000000..00169d1e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cobbled_andesite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cobbled_andesite" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cobbled_deepstone.json b/desktopRuntime/resources/assets/starlike/models/block/cobbled_deepslate.json similarity index 54% rename from desktopRuntime/resources/assets/starlike/models/block/cobbled_deepstone.json rename to desktopRuntime/resources/assets/starlike/models/block/cobbled_deepslate.json index 46516e12..f545a18e 100644 --- a/desktopRuntime/resources/assets/starlike/models/block/cobbled_deepstone.json +++ b/desktopRuntime/resources/assets/starlike/models/block/cobbled_deepslate.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "starlike:blocks/cobbled_deepstone" + "all": "starlike:blocks/cobbled_deepslate" } } diff --git a/desktopRuntime/resources/assets/starlike/models/block/cobbled_diorite.json b/desktopRuntime/resources/assets/starlike/models/block/cobbled_diorite.json new file mode 100644 index 00000000..0ff20945 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cobbled_diorite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cobbled_diorite" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cobbled_granite.json b/desktopRuntime/resources/assets/starlike/models/block/cobbled_granite.json new file mode 100644 index 00000000..9edd5955 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cobbled_granite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cobbled_granite" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cobbled_soul_stone.json b/desktopRuntime/resources/assets/starlike/models/block/cobbled_soul_stone.json new file mode 100644 index 00000000..5bab2f75 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cobbled_soul_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cobbled_soul_stone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/copper.json b/desktopRuntime/resources/assets/starlike/models/block/copper.json new file mode 100644 index 00000000..0f70fe91 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/copper_block.json b/desktopRuntime/resources/assets/starlike/models/block/copper_block.json new file mode 100644 index 00000000..adde1388 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/copper_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/copper_block" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/copper_grate.json b/desktopRuntime/resources/assets/starlike/models/block/copper_grate.json new file mode 100644 index 00000000..03715fa6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/copper_grate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/copper_grate" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/copper_ore.json b/desktopRuntime/resources/assets/starlike/models/block/copper_ore.json new file mode 100644 index 00000000..6fd035b3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/copper_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/copper_ore" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cracked_blackstone.json b/desktopRuntime/resources/assets/starlike/models/block/cracked_blackstone.json new file mode 100644 index 00000000..def7c002 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cracked_blackstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cracked_blackstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cracked_polished_blackstone_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/cracked_polished_blackstone_bricks.json new file mode 100644 index 00000000..20ebf9a3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cracked_polished_blackstone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cracked_polished_blackstone_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/creeper_chiseled_sandstone.json b/desktopRuntime/resources/assets/starlike/models/block/creeper_chiseled_sandstone.json new file mode 100644 index 00000000..bf582fcf --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/creeper_chiseled_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/creeper_chiseled_sandstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cut_copper.json b/desktopRuntime/resources/assets/starlike/models/block/cut_copper.json new file mode 100644 index 00000000..c19a0521 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cut_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cut_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cyan_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/cyan_glazed_terracotta.json new file mode 100644 index 00000000..b0b5236c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cyan_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cyan_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cyan_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/cyan_packed_terracotta.json new file mode 100644 index 00000000..168fa46f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cyan_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cyan_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cyan_planks.json b/desktopRuntime/resources/assets/starlike/models/block/cyan_planks.json new file mode 100644 index 00000000..6642f44c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cyan_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cyan_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/cyan_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/cyan_terracotta_bricks.json new file mode 100644 index 00000000..9d5e6ba0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/cyan_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/cyan_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_acacia_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_acacia_log.json new file mode 100644 index 00000000..2b58c34c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_acacia_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_acacia_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_acacia_planks.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_acacia_planks.json new file mode 100644 index 00000000..1f6f6fb3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_acacia_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_acacia_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_birch_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_birch_log.json new file mode 100644 index 00000000..f82a8660 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_birch_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_birch_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_birch_planks.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_birch_planks.json new file mode 100644 index 00000000..f974f173 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_birch_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_birch_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_dark_oak_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_dark_oak_log.json new file mode 100644 index 00000000..b108a8b7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_dark_oak_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_dark_oak_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_dark_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_dark_oak_planks.json new file mode 100644 index 00000000..b5cba128 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_dark_oak_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_dark_oak_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_jungle_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_jungle_log.json new file mode 100644 index 00000000..f627189a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_jungle_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_jungle_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_jungle_planks.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_jungle_planks.json new file mode 100644 index 00000000..470f332a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_jungle_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_jungle_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_oak_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_oak_log.json new file mode 100644 index 00000000..a7abe909 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_oak_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_oak_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_oak_planks.json new file mode 100644 index 00000000..227ea414 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_oak_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_oak_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_red_sandstone.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_red_sandstone.json new file mode 100644 index 00000000..641d1902 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_red_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_red_sandstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_sandstone.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_sandstone.json new file mode 100644 index 00000000..8b8ca8fc --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_sandstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_spruce_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_spruce_log.json new file mode 100644 index 00000000..87fb6e5f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_spruce_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_spruce_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_spruce_planks.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_spruce_planks.json new file mode 100644 index 00000000..4ed9d281 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_spruce_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_spruce_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_acacia_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_acacia_log.json new file mode 100644 index 00000000..ea56b0c1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_acacia_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_stripped_acacia_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_birch_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_birch_log.json new file mode 100644 index 00000000..e9d77890 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_birch_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_stripped_birch_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_dark_oak_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_dark_oak_log.json new file mode 100644 index 00000000..b046ab89 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_dark_oak_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_stripped_dark_oak_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_jungle_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_jungle_log.json new file mode 100644 index 00000000..57ed8dc0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_jungle_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_stripped_jungle_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_oak_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_oak_log.json new file mode 100644 index 00000000..20a7f242 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_oak_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_stripped_oak_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_spruce_log.json b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_spruce_log.json new file mode 100644 index 00000000..7298fcbb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/decorated_stripped_spruce_log.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/decorated_stripped_spruce_log" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/deep_ocean_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/deep_ocean_bricks.json new file mode 100644 index 00000000..903298af --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/deep_ocean_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/deep_ocean_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/deepstone.json b/desktopRuntime/resources/assets/starlike/models/block/deepslate.json similarity index 58% rename from desktopRuntime/resources/assets/starlike/models/block/deepstone.json rename to desktopRuntime/resources/assets/starlike/models/block/deepslate.json index 265fbd06..bea86199 100644 --- a/desktopRuntime/resources/assets/starlike/models/block/deepstone.json +++ b/desktopRuntime/resources/assets/starlike/models/block/deepslate.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "starlike:blocks/deepstone" + "all": "starlike:blocks/deepslate" } } diff --git a/desktopRuntime/resources/assets/starlike/models/block/deepslate_copper_ore.json b/desktopRuntime/resources/assets/starlike/models/block/deepslate_copper_ore.json new file mode 100644 index 00000000..64a9c82f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/deepslate_copper_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/deepslate_copper_ore" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/diorite_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/diorite_tiles.json new file mode 100644 index 00000000..83cf223c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/diorite_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/diorite_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/dragonite_block.json b/desktopRuntime/resources/assets/starlike/models/block/dragonite_block.json new file mode 100644 index 00000000..de93f790 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/dragonite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/dragonite_block" + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/block/exposed_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/block/exposed_chiseled_copper.json new file mode 100644 index 00000000..f401844e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/exposed_chiseled_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/exposed_chiseled_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/exposed_copper.json b/desktopRuntime/resources/assets/starlike/models/block/exposed_copper.json new file mode 100644 index 00000000..a510e98b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/exposed_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/exposed_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/exposed_copper_grate.json b/desktopRuntime/resources/assets/starlike/models/block/exposed_copper_grate.json new file mode 100644 index 00000000..d2bf5ad1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/exposed_copper_grate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/exposed_copper_grate" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/exposed_cut_copper.json b/desktopRuntime/resources/assets/starlike/models/block/exposed_cut_copper.json new file mode 100644 index 00000000..93e24b0c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/exposed_cut_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/exposed_cut_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/ghast_chiseled_quartz_block.json b/desktopRuntime/resources/assets/starlike/models/block/ghast_chiseled_quartz_block.json new file mode 100644 index 00000000..2ba26534 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/ghast_chiseled_quartz_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/ghast_chiseled_quartz_block" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/gilded_blackstone.json b/desktopRuntime/resources/assets/starlike/models/block/gilded_blackstone.json new file mode 100644 index 00000000..7064b709 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/gilded_blackstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/gilded_blackstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/gold_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/gold_tiles.json new file mode 100644 index 00000000..eb0177fd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/gold_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/gold_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/gray_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/gray_glazed_terracotta.json new file mode 100644 index 00000000..dfc2c19e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/gray_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/gray_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/gray_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/gray_packed_terracotta.json new file mode 100644 index 00000000..13745ac9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/gray_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/gray_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/gray_planks.json b/desktopRuntime/resources/assets/starlike/models/block/gray_planks.json new file mode 100644 index 00000000..069da10c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/gray_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/gray_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/gray_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/gray_terracotta_bricks.json new file mode 100644 index 00000000..8284185c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/gray_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/gray_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/green_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/green_glazed_terracotta.json new file mode 100644 index 00000000..96792df5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/green_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/green_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/green_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/green_packed_terracotta.json new file mode 100644 index 00000000..e1e2bf55 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/green_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/green_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/green_planks.json b/desktopRuntime/resources/assets/starlike/models/block/green_planks.json new file mode 100644 index 00000000..15ec0370 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/green_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/green_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/green_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/green_terracotta_bricks.json new file mode 100644 index 00000000..2730cd82 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/green_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/green_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/head_chiseled_deepslate.json b/desktopRuntime/resources/assets/starlike/models/block/head_chiseled_deepslate.json new file mode 100644 index 00000000..864c7eda --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/head_chiseled_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/head_chiseled_deepslate" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_blue_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/light_blue_glazed_terracotta.json new file mode 100644 index 00000000..19334d33 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_blue_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_blue_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_blue_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/light_blue_packed_terracotta.json new file mode 100644 index 00000000..6abdf47f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_blue_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_blue_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_blue_planks.json b/desktopRuntime/resources/assets/starlike/models/block/light_blue_planks.json new file mode 100644 index 00000000..fa016ae0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_blue_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_blue_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_blue_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/light_blue_terracotta_bricks.json new file mode 100644 index 00000000..54beb64c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_blue_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_blue_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_gray_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/light_gray_glazed_terracotta.json new file mode 100644 index 00000000..33fc2c58 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_gray_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_gray_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_gray_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/light_gray_packed_terracotta.json new file mode 100644 index 00000000..8c738120 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_gray_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_gray_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_gray_planks.json b/desktopRuntime/resources/assets/starlike/models/block/light_gray_planks.json new file mode 100644 index 00000000..51ac43a2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_gray_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_gray_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/light_gray_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/light_gray_terracotta_bricks.json new file mode 100644 index 00000000..9d4a2eb3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/light_gray_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/light_gray_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/lime_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/lime_glazed_terracotta.json new file mode 100644 index 00000000..c696db95 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/lime_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/lime_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/lime_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/lime_packed_terracotta.json new file mode 100644 index 00000000..9e19316e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/lime_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/lime_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/lime_planks.json b/desktopRuntime/resources/assets/starlike/models/block/lime_planks.json new file mode 100644 index 00000000..e6e48ba3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/lime_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/lime_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/lime_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/lime_terracotta_bricks.json new file mode 100644 index 00000000..c0455baa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/lime_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/lime_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/limestone.json b/desktopRuntime/resources/assets/starlike/models/block/limestone.json new file mode 100644 index 00000000..bcddf856 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/limestone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/limestone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/limestone_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/limestone_tiles.json new file mode 100644 index 00000000..95ea7e72 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/limestone_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/limestone_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/magenta_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/magenta_glazed_terracotta.json new file mode 100644 index 00000000..8f7e7d06 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/magenta_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/magenta_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/magenta_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/magenta_packed_terracotta.json new file mode 100644 index 00000000..0e5b2331 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/magenta_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/magenta_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/magenta_planks.json b/desktopRuntime/resources/assets/starlike/models/block/magenta_planks.json new file mode 100644 index 00000000..d1dac898 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/magenta_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/magenta_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/magenta_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/magenta_terracotta_bricks.json new file mode 100644 index 00000000..384fcf4b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/magenta_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/magenta_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/netherite_block.json b/desktopRuntime/resources/assets/starlike/models/block/netherite_block.json new file mode 100644 index 00000000..cf9d951f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/netherite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/netherite_block" + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/block/orange_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/orange_glazed_terracotta.json new file mode 100644 index 00000000..359b7e6f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/orange_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/orange_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/orange_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/orange_packed_terracotta.json new file mode 100644 index 00000000..b08ab833 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/orange_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/orange_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/orange_planks.json b/desktopRuntime/resources/assets/starlike/models/block/orange_planks.json new file mode 100644 index 00000000..4e44ebeb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/orange_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/orange_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/orange_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/orange_terracotta_bricks.json new file mode 100644 index 00000000..81c7098e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/orange_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/orange_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/ornate_red_sandstone.json b/desktopRuntime/resources/assets/starlike/models/block/ornate_red_sandstone.json new file mode 100644 index 00000000..969f5229 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/ornate_red_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/ornate_red_sandstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/ornate_sandstone.json b/desktopRuntime/resources/assets/starlike/models/block/ornate_sandstone.json new file mode 100644 index 00000000..8ae7e933 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/ornate_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/ornate_sandstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/oxidized_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/block/oxidized_chiseled_copper.json new file mode 100644 index 00000000..fbec3b1f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/oxidized_chiseled_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/oxidized_chiseled_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/oxidized_copper.json b/desktopRuntime/resources/assets/starlike/models/block/oxidized_copper.json new file mode 100644 index 00000000..cd2bf76a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/oxidized_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/oxidized_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/oxidized_copper_grate.json b/desktopRuntime/resources/assets/starlike/models/block/oxidized_copper_grate.json new file mode 100644 index 00000000..66dce70d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/oxidized_copper_grate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/oxidized_copper_grate" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/oxidized_cut_copper.json b/desktopRuntime/resources/assets/starlike/models/block/oxidized_cut_copper.json new file mode 100644 index 00000000..77f38b29 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/oxidized_cut_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/oxidized_cut_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/packed_terracotta.json new file mode 100644 index 00000000..98f14e63 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/pink_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/pink_glazed_terracotta.json new file mode 100644 index 00000000..4d8ec4a0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/pink_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/pink_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/pink_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/pink_packed_terracotta.json new file mode 100644 index 00000000..31842a59 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/pink_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/pink_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/pink_planks.json b/desktopRuntime/resources/assets/starlike/models/block/pink_planks.json new file mode 100644 index 00000000..631593f0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/pink_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/pink_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/pink_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/pink_terracotta_bricks.json new file mode 100644 index 00000000..71e4ee43 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/pink_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/pink_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/polished_andesite_brick.json b/desktopRuntime/resources/assets/starlike/models/block/polished_andesite_brick.json new file mode 100644 index 00000000..309c922d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/polished_andesite_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/polished_andesite_brick" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/polished_blackstone.json b/desktopRuntime/resources/assets/starlike/models/block/polished_blackstone.json new file mode 100644 index 00000000..e9042bb7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/polished_blackstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/polished_blackstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/polished_blackstone_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/polished_blackstone_bricks.json new file mode 100644 index 00000000..d6cc45fc --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/polished_blackstone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/polished_blackstone_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/polished_diorite_brick.json b/desktopRuntime/resources/assets/starlike/models/block/polished_diorite_brick.json new file mode 100644 index 00000000..d27e0d59 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/polished_diorite_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/polished_diorite_brick" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/polished_granite_brick.json b/desktopRuntime/resources/assets/starlike/models/block/polished_granite_brick.json new file mode 100644 index 00000000..db4e5aef --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/polished_granite_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/polished_granite_brick" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/polished_tuff.json b/desktopRuntime/resources/assets/starlike/models/block/polished_tuff.json new file mode 100644 index 00000000..377dabd0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/polished_tuff.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/polished_tuff" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/purple_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/purple_glazed_terracotta.json new file mode 100644 index 00000000..30630509 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/purple_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/purple_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/purple_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/purple_packed_terracotta.json new file mode 100644 index 00000000..799eaddd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/purple_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/purple_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/purple_planks.json b/desktopRuntime/resources/assets/starlike/models/block/purple_planks.json new file mode 100644 index 00000000..29f5edb4 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/purple_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/purple_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/purple_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/purple_terracotta_bricks.json new file mode 100644 index 00000000..f80ded23 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/purple_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/purple_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/raw_copper_block.json b/desktopRuntime/resources/assets/starlike/models/block/raw_copper_block.json new file mode 100644 index 00000000..b2c05b90 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/raw_copper_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/raw_copper_block" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/red_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/red_glazed_terracotta.json new file mode 100644 index 00000000..6a507212 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/red_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/red_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/red_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/red_packed_terracotta.json new file mode 100644 index 00000000..54c0c7cb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/red_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/red_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/red_planks.json b/desktopRuntime/resources/assets/starlike/models/block/red_planks.json new file mode 100644 index 00000000..17b697c6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/red_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/red_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/red_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/red_terracotta_bricks.json new file mode 100644 index 00000000..9145f107 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/red_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/red_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/skeleton_chiseled_red_sandstone.json b/desktopRuntime/resources/assets/starlike/models/block/skeleton_chiseled_red_sandstone.json new file mode 100644 index 00000000..56f1af23 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/skeleton_chiseled_red_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/skeleton_chiseled_red_sandstone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/smithing_table.json b/desktopRuntime/resources/assets/starlike/models/block/smithing_table.json new file mode 100644 index 00000000..ca0de111 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/smithing_table.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube_all", + "textures": { + "down": "starlike:blocks/smithing_table_bottom", + "east": "starlike:blocks/smithing_table_side", + "north": "starlike:blocks/smithing_table_front", + "particle": "starlike:blocks/smithing_table_front", + "south": "starlike:blocks/smithing_table_front", + "up": "starlike:blocks/smithing_table_top", + "west": "starlike:blocks/smithing_table_side" + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/block/smooth_basalt.json b/desktopRuntime/resources/assets/starlike/models/block/smooth_basalt.json new file mode 100644 index 00000000..84742859 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/smooth_basalt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/smooth_basalt" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/soul_stone.json b/desktopRuntime/resources/assets/starlike/models/block/soul_stone.json new file mode 100644 index 00000000..83e72793 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/soul_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/soul_stone" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/soul_stone_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/soul_stone_tiles.json new file mode 100644 index 00000000..f3b86666 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/soul_stone_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/soul_stone_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/stone_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/stone_tiles.json new file mode 100644 index 00000000..61e7341b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/stone_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/stone_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/terracotta_bricks.json new file mode 100644 index 00000000..5b5c6865 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/tuff.json b/desktopRuntime/resources/assets/starlike/models/block/tuff.json new file mode 100644 index 00000000..1e100119 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/tuff.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/tuff" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/tuff_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/tuff_bricks.json new file mode 100644 index 00000000..f51e0ffe --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/tuff_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/tuff_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/tuff_tiles.json b/desktopRuntime/resources/assets/starlike/models/block/tuff_tiles.json new file mode 100644 index 00000000..04a74c0e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/tuff_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/tuff_tiles" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/weathered_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/block/weathered_chiseled_copper.json new file mode 100644 index 00000000..4d46d6a8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/weathered_chiseled_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/weathered_chiseled_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/weathered_copper.json b/desktopRuntime/resources/assets/starlike/models/block/weathered_copper.json new file mode 100644 index 00000000..00008502 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/weathered_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/weathered_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/weathered_copper_grate.json b/desktopRuntime/resources/assets/starlike/models/block/weathered_copper_grate.json new file mode 100644 index 00000000..4361645b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/weathered_copper_grate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/weathered_copper_grate" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/weathered_cut_copper.json b/desktopRuntime/resources/assets/starlike/models/block/weathered_cut_copper.json new file mode 100644 index 00000000..a28cc89f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/weathered_cut_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/weathered_cut_copper" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/white_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/white_glazed_terracotta.json new file mode 100644 index 00000000..3af7f7ef --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/white_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/white_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/white_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/white_packed_terracotta.json new file mode 100644 index 00000000..65d72ca6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/white_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/white_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/white_planks.json b/desktopRuntime/resources/assets/starlike/models/block/white_planks.json new file mode 100644 index 00000000..4109fe12 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/white_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/white_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/white_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/white_terracotta_bricks.json new file mode 100644 index 00000000..23932f1d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/white_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/white_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/yellow_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/yellow_glazed_terracotta.json new file mode 100644 index 00000000..149118c3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/yellow_glazed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/yellow_glazed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/yellow_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/block/yellow_packed_terracotta.json new file mode 100644 index 00000000..139f6e61 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/yellow_packed_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/yellow_packed_terracotta" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/yellow_planks.json b/desktopRuntime/resources/assets/starlike/models/block/yellow_planks.json new file mode 100644 index 00000000..cae00b4b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/yellow_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/yellow_planks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/yellow_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/yellow_terracotta_bricks.json new file mode 100644 index 00000000..fc4fdf3f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/yellow_terracotta_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/yellow_terracotta_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/block/zombie_chiseled_stone_bricks.json b/desktopRuntime/resources/assets/starlike/models/block/zombie_chiseled_stone_bricks.json new file mode 100644 index 00000000..9a439bba --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/block/zombie_chiseled_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "starlike:blocks/zombie_chiseled_stone_bricks" + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cobbled_deepstone.json b/desktopRuntime/resources/assets/starlike/models/item/ancient_debris.json similarity index 79% rename from desktopRuntime/resources/assets/starlike/models/item/cobbled_deepstone.json rename to desktopRuntime/resources/assets/starlike/models/item/ancient_debris.json index 8cf75748..c0faf5c8 100644 --- a/desktopRuntime/resources/assets/starlike/models/item/cobbled_deepstone.json +++ b/desktopRuntime/resources/assets/starlike/models/item/ancient_debris.json @@ -1,5 +1,5 @@ { - "parent": "starlike:block/cobbled_deepstone", + "parent": "starlike:block/ancient_debris", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/desktopRuntime/resources/assets/starlike/models/item/andesite_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/andesite_bricks.json new file mode 100644 index 00000000..52cd597a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/andesite_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/andesite_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/andesite_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/andesite_tiles.json new file mode 100644 index 00000000..8d2e7bf2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/andesite_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/andesite_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/black_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/black_glazed_terracotta.json new file mode 100644 index 00000000..9a69da63 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/black_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/black_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/black_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/black_packed_terracotta.json new file mode 100644 index 00000000..0f9b9524 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/black_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/black_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/black_planks.json b/desktopRuntime/resources/assets/starlike/models/item/black_planks.json new file mode 100644 index 00000000..5f72b7da --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/black_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/black_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/black_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/black_terracotta_bricks.json new file mode 100644 index 00000000..227632f9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/black_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/black_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/blackstone.json b/desktopRuntime/resources/assets/starlike/models/item/blackstone.json new file mode 100644 index 00000000..48334467 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/blackstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/blackstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/blue_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/blue_glazed_terracotta.json new file mode 100644 index 00000000..b3268145 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/blue_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/blue_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/blue_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/blue_packed_terracotta.json new file mode 100644 index 00000000..49e7f061 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/blue_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/blue_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/blue_planks.json b/desktopRuntime/resources/assets/starlike/models/item/blue_planks.json new file mode 100644 index 00000000..4c0e258a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/blue_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/blue_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/blue_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/blue_terracotta_bricks.json new file mode 100644 index 00000000..6d598cdf --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/blue_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/blue_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/brown_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/brown_glazed_terracotta.json new file mode 100644 index 00000000..8e877512 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/brown_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/brown_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/brown_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/brown_packed_terracotta.json new file mode 100644 index 00000000..b104562b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/brown_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/brown_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/brown_planks.json b/desktopRuntime/resources/assets/starlike/models/item/brown_planks.json new file mode 100644 index 00000000..caff7e30 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/brown_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/brown_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/brown_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/brown_terracotta_bricks.json new file mode 100644 index 00000000..bdc7f6fa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/brown_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/brown_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/calcite.json b/desktopRuntime/resources/assets/starlike/models/item/calcite.json new file mode 100644 index 00000000..4fbeb34f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/calcite.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/calcite", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/calcite_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/calcite_tiles.json new file mode 100644 index 00000000..0b19af6d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/calcite_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/calcite_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chisel.json b/desktopRuntime/resources/assets/starlike/models/item/chisel.json new file mode 100644 index 00000000..db75275d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chisel.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/chisel" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_acacia_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_acacia_planks.json new file mode 100644 index 00000000..86298f3f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_acacia_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_acacia_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_bamboo_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_bamboo_planks.json new file mode 100644 index 00000000..2075f68b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_bamboo_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_bamboo_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_birch_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_birch_planks.json new file mode 100644 index 00000000..a38b02cb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_birch_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_birch_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_cherry_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_cherry_planks.json new file mode 100644 index 00000000..7d7d6ed0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_cherry_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_cherry_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_copper.json new file mode 100644 index 00000000..96aa2c55 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_crimson_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_crimson_planks.json new file mode 100644 index 00000000..ea9fd764 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_crimson_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_crimson_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_dark_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_dark_oak_planks.json new file mode 100644 index 00000000..a8ce0d13 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_dark_oak_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_dark_oak_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_deep_ocean_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_deep_ocean_bricks.json new file mode 100644 index 00000000..601591c1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_deep_ocean_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_deep_ocean_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_jungle_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_jungle_planks.json new file mode 100644 index 00000000..cb459c45 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_jungle_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_jungle_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_mangrove_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_mangrove_planks.json new file mode 100644 index 00000000..32232b1f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_mangrove_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_mangrove_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_oak_planks.json new file mode 100644 index 00000000..a5794ae8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_oak_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_oak_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_polished_blackstone.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_polished_blackstone.json new file mode 100644 index 00000000..c919f675 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_polished_blackstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_polished_blackstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_spruce_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_spruce_planks.json new file mode 100644 index 00000000..e14dafe2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_spruce_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_spruce_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff.json new file mode 100644 index 00000000..607316e6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_tuff", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff_bricks.json new file mode 100644 index 00000000..1e97270f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_tuff_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff_top.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff_top.json new file mode 100644 index 00000000..7b5f21cf --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_tuff_top.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_tuff_top", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/chiseled_warped_planks.json b/desktopRuntime/resources/assets/starlike/models/item/chiseled_warped_planks.json new file mode 100644 index 00000000..52e55017 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/chiseled_warped_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/chiseled_warped_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cobbled_andesite.json b/desktopRuntime/resources/assets/starlike/models/item/cobbled_andesite.json new file mode 100644 index 00000000..2852e2f4 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cobbled_andesite.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cobbled_andesite", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cobbled_deepslate.json b/desktopRuntime/resources/assets/starlike/models/item/cobbled_deepslate.json new file mode 100644 index 00000000..660602e6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cobbled_deepslate.json @@ -0,0 +1,10 @@ +{ + "parent": "starlike:block/cobbled_deepslate", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/cobbled_diorite.json b/desktopRuntime/resources/assets/starlike/models/item/cobbled_diorite.json new file mode 100644 index 00000000..804fd93a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cobbled_diorite.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cobbled_diorite", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cobbled_granite.json b/desktopRuntime/resources/assets/starlike/models/item/cobbled_granite.json new file mode 100644 index 00000000..10f30800 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cobbled_granite.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cobbled_granite", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cobbled_soul_stone.json b/desktopRuntime/resources/assets/starlike/models/item/cobbled_soul_stone.json new file mode 100644 index 00000000..9dcde8a9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cobbled_soul_stone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cobbled_soul_stone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/copper_block.json b/desktopRuntime/resources/assets/starlike/models/item/copper_block.json new file mode 100644 index 00000000..20abcb74 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/copper_block.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/copper_block", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/copper_grate.json b/desktopRuntime/resources/assets/starlike/models/item/copper_grate.json new file mode 100644 index 00000000..41a0300b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/copper_grate.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/copper_grate", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/copper_ingot.json b/desktopRuntime/resources/assets/starlike/models/item/copper_ingot.json new file mode 100644 index 00000000..ff489c14 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/copper_ingot.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/copper_ingot" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/copper_ore.json b/desktopRuntime/resources/assets/starlike/models/item/copper_ore.json new file mode 100644 index 00000000..b993f20d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/copper_ore.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/copper_ore", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cracked_blackstone.json b/desktopRuntime/resources/assets/starlike/models/item/cracked_blackstone.json new file mode 100644 index 00000000..a8d19f71 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cracked_blackstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cracked_blackstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cracked_polished_blackstone_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/cracked_polished_blackstone_bricks.json new file mode 100644 index 00000000..89ede1d4 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cracked_polished_blackstone_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cracked_polished_blackstone_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/creeper_chiseled_sandstone.json b/desktopRuntime/resources/assets/starlike/models/item/creeper_chiseled_sandstone.json new file mode 100644 index 00000000..c0171104 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/creeper_chiseled_sandstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/creeper_chiseled_sandstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cut_copper.json b/desktopRuntime/resources/assets/starlike/models/item/cut_copper.json new file mode 100644 index 00000000..57baf48c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cut_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cut_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cyan_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/cyan_glazed_terracotta.json new file mode 100644 index 00000000..c031322d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cyan_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cyan_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cyan_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/cyan_packed_terracotta.json new file mode 100644 index 00000000..eadefc87 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cyan_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cyan_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cyan_planks.json b/desktopRuntime/resources/assets/starlike/models/item/cyan_planks.json new file mode 100644 index 00000000..2c7170b5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cyan_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cyan_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/cyan_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/cyan_terracotta_bricks.json new file mode 100644 index 00000000..6379c515 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/cyan_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/cyan_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_acacia_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_acacia_log.json new file mode 100644 index 00000000..5ee2b49d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_acacia_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_acacia_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_acacia_planks.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_acacia_planks.json new file mode 100644 index 00000000..64a9834f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_acacia_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_acacia_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_birch_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_birch_log.json new file mode 100644 index 00000000..397e85ce --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_birch_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_birch_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_birch_planks.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_birch_planks.json new file mode 100644 index 00000000..d82f4a5a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_birch_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_birch_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_dark_oak_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_dark_oak_log.json new file mode 100644 index 00000000..0254aad9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_dark_oak_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_dark_oak_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_dark_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_dark_oak_planks.json new file mode 100644 index 00000000..5c3b9cfd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_dark_oak_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_dark_oak_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_jungle_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_jungle_log.json new file mode 100644 index 00000000..aa973dfe --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_jungle_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_jungle_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_jungle_planks.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_jungle_planks.json new file mode 100644 index 00000000..321c3601 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_jungle_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_jungle_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_oak_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_oak_log.json new file mode 100644 index 00000000..623dbbd5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_oak_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_oak_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_oak_planks.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_oak_planks.json new file mode 100644 index 00000000..fe798371 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_oak_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_oak_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_red_sandstone.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_red_sandstone.json new file mode 100644 index 00000000..6a11555a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_red_sandstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_red_sandstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_sandstone.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_sandstone.json new file mode 100644 index 00000000..94e3f120 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_sandstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_sandstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_spruce_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_spruce_log.json new file mode 100644 index 00000000..06d7b2ab --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_spruce_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_spruce_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_spruce_planks.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_spruce_planks.json new file mode 100644 index 00000000..a80a1f80 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_spruce_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_spruce_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_acacia_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_acacia_log.json new file mode 100644 index 00000000..62a39e5a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_acacia_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_stripped_acacia_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_birch_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_birch_log.json new file mode 100644 index 00000000..480cce7f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_birch_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_stripped_birch_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_dark_oak_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_dark_oak_log.json new file mode 100644 index 00000000..615a196a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_dark_oak_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_stripped_dark_oak_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_jungle_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_jungle_log.json new file mode 100644 index 00000000..1f83c465 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_jungle_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_stripped_jungle_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_oak_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_oak_log.json new file mode 100644 index 00000000..5213d326 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_oak_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_stripped_oak_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_spruce_log.json b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_spruce_log.json new file mode 100644 index 00000000..92ca4fb3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/decorated_stripped_spruce_log.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/decorated_stripped_spruce_log", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/deep_ocean_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/deep_ocean_bricks.json new file mode 100644 index 00000000..614fbd87 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/deep_ocean_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/deep_ocean_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/deepstone.json b/desktopRuntime/resources/assets/starlike/models/item/deepslate.json similarity index 82% rename from desktopRuntime/resources/assets/starlike/models/item/deepstone.json rename to desktopRuntime/resources/assets/starlike/models/item/deepslate.json index 384e167d..9bbd934c 100644 --- a/desktopRuntime/resources/assets/starlike/models/item/deepstone.json +++ b/desktopRuntime/resources/assets/starlike/models/item/deepslate.json @@ -1,5 +1,5 @@ { - "parent": "starlike:block/deepstone", + "parent": "starlike:block/deepslate", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/desktopRuntime/resources/assets/starlike/models/item/deepslate_copper_ore.json b/desktopRuntime/resources/assets/starlike/models/item/deepslate_copper_ore.json new file mode 100644 index 00000000..1b22e63d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/deepslate_copper_ore.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/deepslate_copper_ore", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/diorite_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/diorite_tiles.json new file mode 100644 index 00000000..c590cfc2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/diorite_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/diorite_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/dragonite.json b/desktopRuntime/resources/assets/starlike/models/item/dragonite.json new file mode 100644 index 00000000..858bbbd2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/dragonite.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/dragonite" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/dragonite_block.json b/desktopRuntime/resources/assets/starlike/models/item/dragonite_block.json new file mode 100644 index 00000000..0ccd1c11 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/dragonite_block.json @@ -0,0 +1,10 @@ +{ + "parent": "starlike:block/dragonite_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/exposed_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/item/exposed_chiseled_copper.json new file mode 100644 index 00000000..7b6b6d9a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/exposed_chiseled_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/exposed_chiseled_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/exposed_copper.json b/desktopRuntime/resources/assets/starlike/models/item/exposed_copper.json new file mode 100644 index 00000000..8fe80bda --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/exposed_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/exposed_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/exposed_copper_grate.json b/desktopRuntime/resources/assets/starlike/models/item/exposed_copper_grate.json new file mode 100644 index 00000000..86f2187d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/exposed_copper_grate.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/exposed_copper_grate", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/exposed_cut_copper.json b/desktopRuntime/resources/assets/starlike/models/item/exposed_cut_copper.json new file mode 100644 index 00000000..f4765d2c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/exposed_cut_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/exposed_cut_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/ghast_chiseled_quartz_block.json b/desktopRuntime/resources/assets/starlike/models/item/ghast_chiseled_quartz_block.json new file mode 100644 index 00000000..f40c434a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/ghast_chiseled_quartz_block.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/ghast_chiseled_quartz_block", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/gilded_blackstone.json b/desktopRuntime/resources/assets/starlike/models/item/gilded_blackstone.json new file mode 100644 index 00000000..3c98be68 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/gilded_blackstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/gilded_blackstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/gold_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/gold_tiles.json new file mode 100644 index 00000000..e0588da2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/gold_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/gold_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/gray_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/gray_glazed_terracotta.json new file mode 100644 index 00000000..be746d8a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/gray_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/gray_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/gray_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/gray_packed_terracotta.json new file mode 100644 index 00000000..719af35c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/gray_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/gray_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/gray_planks.json b/desktopRuntime/resources/assets/starlike/models/item/gray_planks.json new file mode 100644 index 00000000..737ff5d2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/gray_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/gray_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/gray_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/gray_terracotta_bricks.json new file mode 100644 index 00000000..c01d05e3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/gray_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/gray_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/green_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/green_glazed_terracotta.json new file mode 100644 index 00000000..13c76f6b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/green_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/green_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/green_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/green_packed_terracotta.json new file mode 100644 index 00000000..90096f4e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/green_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/green_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/green_planks.json b/desktopRuntime/resources/assets/starlike/models/item/green_planks.json new file mode 100644 index 00000000..e5ec464d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/green_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/green_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/green_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/green_terracotta_bricks.json new file mode 100644 index 00000000..89ddac94 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/green_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/green_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/head_chiseled_deepslate.json b/desktopRuntime/resources/assets/starlike/models/item/head_chiseled_deepslate.json new file mode 100644 index 00000000..6bd775a3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/head_chiseled_deepslate.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/head_chiseled_deepslate", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_blue_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/light_blue_glazed_terracotta.json new file mode 100644 index 00000000..c35913ea --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_blue_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_blue_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_blue_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/light_blue_packed_terracotta.json new file mode 100644 index 00000000..a438c5fd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_blue_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_blue_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_blue_planks.json b/desktopRuntime/resources/assets/starlike/models/item/light_blue_planks.json new file mode 100644 index 00000000..1505ed92 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_blue_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_blue_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_blue_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/light_blue_terracotta_bricks.json new file mode 100644 index 00000000..c2514214 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_blue_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_blue_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_gray_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/light_gray_glazed_terracotta.json new file mode 100644 index 00000000..382b0ea7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_gray_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_gray_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_gray_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/light_gray_packed_terracotta.json new file mode 100644 index 00000000..6d644023 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_gray_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_gray_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_gray_planks.json b/desktopRuntime/resources/assets/starlike/models/item/light_gray_planks.json new file mode 100644 index 00000000..b4b8b75b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_gray_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_gray_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/light_gray_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/light_gray_terracotta_bricks.json new file mode 100644 index 00000000..67152337 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/light_gray_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/light_gray_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/lime_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/lime_glazed_terracotta.json new file mode 100644 index 00000000..35facad0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/lime_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/lime_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/lime_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/lime_packed_terracotta.json new file mode 100644 index 00000000..900dcc36 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/lime_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/lime_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/lime_planks.json b/desktopRuntime/resources/assets/starlike/models/item/lime_planks.json new file mode 100644 index 00000000..803f8bff --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/lime_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/lime_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/lime_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/lime_terracotta_bricks.json new file mode 100644 index 00000000..1811b73a --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/lime_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/lime_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/limestone.json b/desktopRuntime/resources/assets/starlike/models/item/limestone.json new file mode 100644 index 00000000..37a96d76 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/limestone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/limestone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/limestone_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/limestone_tiles.json new file mode 100644 index 00000000..2d9d3525 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/limestone_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/limestone_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/magenta_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/magenta_glazed_terracotta.json new file mode 100644 index 00000000..56bfd0e3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/magenta_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/magenta_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/magenta_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/magenta_packed_terracotta.json new file mode 100644 index 00000000..fcb1c302 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/magenta_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/magenta_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/magenta_planks.json b/desktopRuntime/resources/assets/starlike/models/item/magenta_planks.json new file mode 100644 index 00000000..9f142828 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/magenta_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/magenta_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/magenta_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/magenta_terracotta_bricks.json new file mode 100644 index 00000000..554e66eb --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/magenta_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/magenta_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_axe.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_axe.json new file mode 100644 index 00000000..8c7475fe --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_axe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_axe" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_block.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_block.json new file mode 100644 index 00000000..e6201ef5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_block.json @@ -0,0 +1,10 @@ +{ + "parent": "starlike:block/netherite_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_boots.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_boots.json new file mode 100644 index 00000000..f50e1f90 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_boots.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_boots" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_chestplate.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_chestplate.json new file mode 100644 index 00000000..2acbdb43 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_chestplate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_chestplate" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_helmet.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_helmet.json new file mode 100644 index 00000000..8bc62143 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_helmet.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_helmet" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_hoe.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_hoe.json new file mode 100644 index 00000000..00318a87 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_hoe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_hoe" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_ingot.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_ingot.json new file mode 100644 index 00000000..264bd0db --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_ingot.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_ingot" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_leggings.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_leggings.json new file mode 100644 index 00000000..b92d8045 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_leggings.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_leggings" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_pickaxe.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_pickaxe.json new file mode 100644 index 00000000..f1f74544 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_pickaxe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_pickaxe" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_scrap.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_scrap.json new file mode 100644 index 00000000..012e443c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_scrap.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_scrap" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_shovel.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_shovel.json new file mode 100644 index 00000000..a13545b4 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_shovel.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_shovel" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/netherite_sword.json b/desktopRuntime/resources/assets/starlike/models/item/netherite_sword.json new file mode 100644 index 00000000..b2a916f1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/netherite_sword.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "starlike:items/netherite_sword" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/orange_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/orange_glazed_terracotta.json new file mode 100644 index 00000000..afea5db6 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/orange_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/orange_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/orange_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/orange_packed_terracotta.json new file mode 100644 index 00000000..05cbfef8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/orange_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/orange_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/orange_planks.json b/desktopRuntime/resources/assets/starlike/models/item/orange_planks.json new file mode 100644 index 00000000..d9e5fe57 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/orange_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/orange_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/orange_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/orange_terracotta_bricks.json new file mode 100644 index 00000000..15c894a0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/orange_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/orange_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/ornate_red_sandstone.json b/desktopRuntime/resources/assets/starlike/models/item/ornate_red_sandstone.json new file mode 100644 index 00000000..04096b52 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/ornate_red_sandstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/ornate_red_sandstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/ornate_sandstone.json b/desktopRuntime/resources/assets/starlike/models/item/ornate_sandstone.json new file mode 100644 index 00000000..4320c9cc --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/ornate_sandstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/ornate_sandstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/oxidized_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/item/oxidized_chiseled_copper.json new file mode 100644 index 00000000..023a2498 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/oxidized_chiseled_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/oxidized_chiseled_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/oxidized_copper.json b/desktopRuntime/resources/assets/starlike/models/item/oxidized_copper.json new file mode 100644 index 00000000..8c51b936 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/oxidized_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/oxidized_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/oxidized_copper_grate.json b/desktopRuntime/resources/assets/starlike/models/item/oxidized_copper_grate.json new file mode 100644 index 00000000..633e1fa1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/oxidized_copper_grate.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/oxidized_copper_grate", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/oxidized_cut_copper.json b/desktopRuntime/resources/assets/starlike/models/item/oxidized_cut_copper.json new file mode 100644 index 00000000..92043195 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/oxidized_cut_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/oxidized_cut_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/packed_terracotta.json new file mode 100644 index 00000000..41d7baf9 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/pink_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/pink_glazed_terracotta.json new file mode 100644 index 00000000..1ca733aa --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/pink_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/pink_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/pink_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/pink_packed_terracotta.json new file mode 100644 index 00000000..ef4363c3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/pink_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/pink_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/pink_planks.json b/desktopRuntime/resources/assets/starlike/models/item/pink_planks.json new file mode 100644 index 00000000..e315eccf --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/pink_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/pink_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/pink_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/pink_terracotta_bricks.json new file mode 100644 index 00000000..15f393e5 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/pink_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/pink_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/polished_andesite_brick.json b/desktopRuntime/resources/assets/starlike/models/item/polished_andesite_brick.json new file mode 100644 index 00000000..cc07fe22 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/polished_andesite_brick.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/polished_andesite_brick", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/polished_blackstone.json b/desktopRuntime/resources/assets/starlike/models/item/polished_blackstone.json new file mode 100644 index 00000000..3052f754 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/polished_blackstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/polished_blackstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/polished_blackstone_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/polished_blackstone_bricks.json new file mode 100644 index 00000000..54210c0e --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/polished_blackstone_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/polished_blackstone_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/polished_diorite_brick.json b/desktopRuntime/resources/assets/starlike/models/item/polished_diorite_brick.json new file mode 100644 index 00000000..cfa0defd --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/polished_diorite_brick.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/polished_diorite_brick", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/polished_granite_brick.json b/desktopRuntime/resources/assets/starlike/models/item/polished_granite_brick.json new file mode 100644 index 00000000..2fe16995 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/polished_granite_brick.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/polished_granite_brick", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/polished_tuff.json b/desktopRuntime/resources/assets/starlike/models/item/polished_tuff.json new file mode 100644 index 00000000..0005816b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/polished_tuff.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/polished_tuff", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/purple_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/purple_glazed_terracotta.json new file mode 100644 index 00000000..f6da10d8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/purple_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/purple_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/purple_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/purple_packed_terracotta.json new file mode 100644 index 00000000..2a1b1cea --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/purple_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/purple_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/purple_planks.json b/desktopRuntime/resources/assets/starlike/models/item/purple_planks.json new file mode 100644 index 00000000..aa4cdc34 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/purple_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/purple_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/purple_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/purple_terracotta_bricks.json new file mode 100644 index 00000000..fbc9e6f0 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/purple_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/purple_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/raw_copper_block.json b/desktopRuntime/resources/assets/starlike/models/item/raw_copper_block.json new file mode 100644 index 00000000..2c6d9751 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/raw_copper_block.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/raw_copper_block", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/red_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/red_glazed_terracotta.json new file mode 100644 index 00000000..1bf00650 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/red_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/red_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/red_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/red_packed_terracotta.json new file mode 100644 index 00000000..ebb5171d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/red_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/red_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/red_planks.json b/desktopRuntime/resources/assets/starlike/models/item/red_planks.json new file mode 100644 index 00000000..3aa8fc21 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/red_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/red_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/red_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/red_terracotta_bricks.json new file mode 100644 index 00000000..8046ae97 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/red_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/red_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/skeleton_chiseled_red_sandstone.json b/desktopRuntime/resources/assets/starlike/models/item/skeleton_chiseled_red_sandstone.json new file mode 100644 index 00000000..8da790d7 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/skeleton_chiseled_red_sandstone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/skeleton_chiseled_red_sandstone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/smithing_table.json b/desktopRuntime/resources/assets/starlike/models/item/smithing_table.json new file mode 100644 index 00000000..aa94ab9f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/smithing_table.json @@ -0,0 +1,10 @@ +{ + "parent": "starlike:block/smithing_table", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/desktopRuntime/resources/assets/starlike/models/item/smooth_basalt.json b/desktopRuntime/resources/assets/starlike/models/item/smooth_basalt.json new file mode 100644 index 00000000..5c95140c --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/smooth_basalt.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/smooth_basalt", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/soul_stone.json b/desktopRuntime/resources/assets/starlike/models/item/soul_stone.json new file mode 100644 index 00000000..90d69f31 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/soul_stone.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/soul_stone", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/soul_stone_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/soul_stone_tiles.json new file mode 100644 index 00000000..212eabff --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/soul_stone_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/soul_stone_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/stone_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/stone_tiles.json new file mode 100644 index 00000000..db26d75b --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/stone_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/stone_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/terracotta_bricks.json new file mode 100644 index 00000000..080a1dbf --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/tuff.json b/desktopRuntime/resources/assets/starlike/models/item/tuff.json new file mode 100644 index 00000000..6551bce1 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/tuff.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/tuff", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/tuff_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/tuff_bricks.json new file mode 100644 index 00000000..794cb1ca --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/tuff_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/tuff_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/tuff_tiles.json b/desktopRuntime/resources/assets/starlike/models/item/tuff_tiles.json new file mode 100644 index 00000000..19f0e28f --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/tuff_tiles.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/tuff_tiles", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/weathered_chiseled_copper.json b/desktopRuntime/resources/assets/starlike/models/item/weathered_chiseled_copper.json new file mode 100644 index 00000000..c49afac3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/weathered_chiseled_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/weathered_chiseled_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/weathered_copper.json b/desktopRuntime/resources/assets/starlike/models/item/weathered_copper.json new file mode 100644 index 00000000..204999c3 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/weathered_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/weathered_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/weathered_copper_grate.json b/desktopRuntime/resources/assets/starlike/models/item/weathered_copper_grate.json new file mode 100644 index 00000000..545b9ae8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/weathered_copper_grate.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/weathered_copper_grate", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/weathered_cut_copper.json b/desktopRuntime/resources/assets/starlike/models/item/weathered_cut_copper.json new file mode 100644 index 00000000..1aa068a2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/weathered_cut_copper.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/weathered_cut_copper", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/white_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/white_glazed_terracotta.json new file mode 100644 index 00000000..8ce5a4e2 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/white_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/white_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/white_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/white_packed_terracotta.json new file mode 100644 index 00000000..7091ee9d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/white_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/white_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/white_planks.json b/desktopRuntime/resources/assets/starlike/models/item/white_planks.json new file mode 100644 index 00000000..8b411524 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/white_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/white_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/white_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/white_terracotta_bricks.json new file mode 100644 index 00000000..2281c2c8 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/white_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/white_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/yellow_glazed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/yellow_glazed_terracotta.json new file mode 100644 index 00000000..d6dae453 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/yellow_glazed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/yellow_glazed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/yellow_packed_terracotta.json b/desktopRuntime/resources/assets/starlike/models/item/yellow_packed_terracotta.json new file mode 100644 index 00000000..c43a4e0d --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/yellow_packed_terracotta.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/yellow_packed_terracotta", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/yellow_planks.json b/desktopRuntime/resources/assets/starlike/models/item/yellow_planks.json new file mode 100644 index 00000000..9ba3b840 --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/yellow_planks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/yellow_planks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/yellow_terracotta_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/yellow_terracotta_bricks.json new file mode 100644 index 00000000..7e81d7ae --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/yellow_terracotta_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/yellow_terracotta_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/models/item/zombie_chiseled_stone_bricks.json b/desktopRuntime/resources/assets/starlike/models/item/zombie_chiseled_stone_bricks.json new file mode 100644 index 00000000..e49728fc --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/models/item/zombie_chiseled_stone_bricks.json @@ -0,0 +1,22 @@ +{ + "parent": "starlike:block/zombie_chiseled_stone_bricks", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/sounds.json b/desktopRuntime/resources/assets/starlike/sounds.json new file mode 100644 index 00000000..3833afad --- /dev/null +++ b/desktopRuntime/resources/assets/starlike/sounds.json @@ -0,0 +1,8 @@ +{ + "random.chisel": { + "category": "player", + "sounds": [ + "starlike:random/chisel" + ] + } +} diff --git a/desktopRuntime/resources/assets/starlike/sounds/random/chisel.ogg b/desktopRuntime/resources/assets/starlike/sounds/random/chisel.ogg new file mode 100644 index 00000000..3bb65f51 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/sounds/random/chisel.ogg differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/ancient_debris_side.png b/desktopRuntime/resources/assets/starlike/textures/blocks/ancient_debris_side.png new file mode 100644 index 00000000..50077884 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/ancient_debris_side.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/ancient_debris_top.png b/desktopRuntime/resources/assets/starlike/textures/blocks/ancient_debris_top.png new file mode 100644 index 00000000..f8a52f9c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/ancient_debris_top.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/andesite_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/andesite_bricks.png new file mode 100644 index 00000000..f5d2a450 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/andesite_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/andesite_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/andesite_tiles.png new file mode 100644 index 00000000..160f7fe1 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/andesite_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/black_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/black_glazed_terracotta.png new file mode 100644 index 00000000..fa87088a Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/black_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/black_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/black_packed_terracotta.png new file mode 100644 index 00000000..b65518ce Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/black_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/black_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/black_planks.png new file mode 100644 index 00000000..c66717d6 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/black_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/black_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/black_terracotta_bricks.png new file mode 100644 index 00000000..04eaf5c7 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/black_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/blackstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/blackstone.png new file mode 100644 index 00000000..3213cc35 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/blackstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/blue_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_glazed_terracotta.png new file mode 100644 index 00000000..2c841c36 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/blue_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_packed_terracotta.png new file mode 100644 index 00000000..0ca1e32f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/blue_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_planks.png new file mode 100644 index 00000000..094e30cb Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/blue_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_terracotta_bricks.png new file mode 100644 index 00000000..f857b942 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/blue_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/brown_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_glazed_terracotta.png new file mode 100644 index 00000000..132144c2 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/brown_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_packed_terracotta.png new file mode 100644 index 00000000..942ceb7c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/brown_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_planks.png new file mode 100644 index 00000000..74963c35 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/brown_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_terracotta_bricks.png new file mode 100644 index 00000000..a4094257 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/brown_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/calcite.png b/desktopRuntime/resources/assets/starlike/textures/blocks/calcite.png new file mode 100644 index 00000000..f0d11706 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/calcite.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/calcite_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/calcite_tiles.png new file mode 100644 index 00000000..c0dcb3bb Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/calcite_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_acacia_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_acacia_planks.png new file mode 100644 index 00000000..a0b250c0 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_acacia_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_bamboo_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_bamboo_planks.png new file mode 100644 index 00000000..b2646bf8 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_bamboo_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_birch_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_birch_planks.png new file mode 100644 index 00000000..4e3811ad Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_birch_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_cherry_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_cherry_planks.png new file mode 100644 index 00000000..3dc66147 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_cherry_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_copper.png new file mode 100644 index 00000000..72bc0618 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_crimson_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_crimson_planks.png new file mode 100644 index 00000000..dcb242b6 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_crimson_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_dark_oak_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_dark_oak_planks.png new file mode 100644 index 00000000..91ef9768 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_dark_oak_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_deep_ocean_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_deep_ocean_bricks.png new file mode 100644 index 00000000..d5e4528c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_deep_ocean_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_jungle_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_jungle_planks.png new file mode 100644 index 00000000..15488b9c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_jungle_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_mangrove_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_mangrove_planks.png new file mode 100644 index 00000000..cf0f639b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_mangrove_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_oak_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_oak_planks.png new file mode 100644 index 00000000..f58db625 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_oak_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_polished_blackstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_polished_blackstone.png new file mode 100644 index 00000000..99fdb180 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_polished_blackstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_spruce_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_spruce_planks.png new file mode 100644 index 00000000..3dd7ea0e Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_spruce_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff.png new file mode 100644 index 00000000..05c51a49 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff_bricks.png new file mode 100644 index 00000000..3631249b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff_top.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff_top.png new file mode 100644 index 00000000..4fd51a18 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_tuff_top.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_warped_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_warped_planks.png new file mode 100644 index 00000000..e6a9c302 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/chiseled_warped_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_andesite.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_andesite.png new file mode 100644 index 00000000..165637f2 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_andesite.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_deepslate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_deepslate.png new file mode 100644 index 00000000..0f403505 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_deepslate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_deepstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_deepstone.png deleted file mode 100644 index 16e5eb0f..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_deepstone.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_diorite.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_diorite.png new file mode 100644 index 00000000..e1fefcc5 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_diorite.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_granite.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_granite.png new file mode 100644 index 00000000..a5574c43 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_granite.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_soul_stone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_soul_stone.png new file mode 100644 index 00000000..7520d1c1 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cobbled_soul_stone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/copper.png new file mode 100644 index 00000000..42c2b614 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/copper_block.png b/desktopRuntime/resources/assets/starlike/textures/blocks/copper_block.png new file mode 100644 index 00000000..6187c469 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/copper_block.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/copper_grate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/copper_grate.png new file mode 100644 index 00000000..67673242 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/copper_grate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/copper_ore.png b/desktopRuntime/resources/assets/starlike/textures/blocks/copper_ore.png new file mode 100644 index 00000000..adf0900c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/copper_ore.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cracked_blackstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cracked_blackstone.png new file mode 100644 index 00000000..edd645d0 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cracked_blackstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cracked_polished_blackstone_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cracked_polished_blackstone_bricks.png new file mode 100644 index 00000000..ba5650e4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cracked_polished_blackstone_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/creeper_chiseled_sandstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/creeper_chiseled_sandstone.png new file mode 100644 index 00000000..511a8687 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/creeper_chiseled_sandstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cut_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cut_copper.png new file mode 100644 index 00000000..1d901b61 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cut_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_glazed_terracotta.png new file mode 100644 index 00000000..13bf97f3 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_packed_terracotta.png new file mode 100644 index 00000000..52dbcb4c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_planks.png new file mode 100644 index 00000000..f8c2dfe4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_terracotta_bricks.png new file mode 100644 index 00000000..9e361d56 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/cyan_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_acacia_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_acacia_log.png new file mode 100644 index 00000000..91f9d52b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_acacia_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_acacia_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_acacia_planks.png new file mode 100644 index 00000000..c7a92613 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_acacia_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_birch_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_birch_log.png new file mode 100644 index 00000000..2adcc479 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_birch_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_birch_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_birch_planks.png new file mode 100644 index 00000000..bdf8b14a Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_birch_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_dark_oak_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_dark_oak_log.png new file mode 100644 index 00000000..91a5663b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_dark_oak_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_dark_oak_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_dark_oak_planks.png new file mode 100644 index 00000000..8f0c4f52 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_dark_oak_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_jungle_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_jungle_log.png new file mode 100644 index 00000000..ac65a92e Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_jungle_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_jungle_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_jungle_planks.png new file mode 100644 index 00000000..08cb0e53 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_jungle_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_oak_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_oak_log.png new file mode 100644 index 00000000..d51a1b8e Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_oak_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_oak_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_oak_planks.png new file mode 100644 index 00000000..970a2fc6 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_oak_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_red_sandstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_red_sandstone.png new file mode 100644 index 00000000..233acf36 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_red_sandstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_sandstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_sandstone.png new file mode 100644 index 00000000..65f85af2 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_sandstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_spruce_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_spruce_log.png new file mode 100644 index 00000000..1ec3c349 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_spruce_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_spruce_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_spruce_planks.png new file mode 100644 index 00000000..8bc63997 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_spruce_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_acacia_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_acacia_log.png new file mode 100644 index 00000000..c27326a8 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_acacia_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_birch_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_birch_log.png new file mode 100644 index 00000000..291e6774 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_birch_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_dark_oak_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_dark_oak_log.png new file mode 100644 index 00000000..2b070360 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_dark_oak_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_jungle_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_jungle_log.png new file mode 100644 index 00000000..5a770df3 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_jungle_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_oak_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_oak_log.png new file mode 100644 index 00000000..a5dfb729 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_oak_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_spruce_log.png b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_spruce_log.png new file mode 100644 index 00000000..150da932 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/decorated_stripped_spruce_log.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/deep_ocean_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/deep_ocean_bricks.png new file mode 100644 index 00000000..a4317c6f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/deep_ocean_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/deepslate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/deepslate.png new file mode 100644 index 00000000..3620ecdc Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/deepslate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/deepslate_copper_ore.png b/desktopRuntime/resources/assets/starlike/textures/blocks/deepslate_copper_ore.png new file mode 100644 index 00000000..9c167a2b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/deepslate_copper_ore.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/deepstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/deepstone.png deleted file mode 100644 index 56f3c5ff..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/blocks/deepstone.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/diorite_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/diorite_tiles.png new file mode 100644 index 00000000..9ecb9570 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/diorite_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/dragonite_block.png b/desktopRuntime/resources/assets/starlike/textures/blocks/dragonite_block.png new file mode 100644 index 00000000..76e39d74 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/dragonite_block.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_chiseled_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_chiseled_copper.png new file mode 100644 index 00000000..93c44634 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_chiseled_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_copper.png new file mode 100644 index 00000000..599a32fb Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_copper_grate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_copper_grate.png new file mode 100644 index 00000000..24c12ec9 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_copper_grate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_cut_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_cut_copper.png new file mode 100644 index 00000000..c4bb379f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/exposed_cut_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/ghast_chiseled_quartz_block.png b/desktopRuntime/resources/assets/starlike/textures/blocks/ghast_chiseled_quartz_block.png new file mode 100644 index 00000000..0211bfd3 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/ghast_chiseled_quartz_block.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/gilded_blackstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/gilded_blackstone.png new file mode 100644 index 00000000..2ce8c769 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/gilded_blackstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/gold_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/gold_tiles.png new file mode 100644 index 00000000..e65cfac7 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/gold_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/gray_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_glazed_terracotta.png new file mode 100644 index 00000000..cd3e7017 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/gray_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_packed_terracotta.png new file mode 100644 index 00000000..d45503ae Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/gray_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_planks.png new file mode 100644 index 00000000..87a1b471 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/gray_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_terracotta_bricks.png new file mode 100644 index 00000000..340b0c79 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/gray_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/green_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/green_glazed_terracotta.png new file mode 100644 index 00000000..7055b4b1 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/green_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/green_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/green_packed_terracotta.png new file mode 100644 index 00000000..65418d68 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/green_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/green_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/green_planks.png new file mode 100644 index 00000000..292e0533 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/green_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/green_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/green_terracotta_bricks.png new file mode 100644 index 00000000..879a17c4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/green_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/head_chiseled_deepslate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/head_chiseled_deepslate.png new file mode 100644 index 00000000..a21b1869 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/head_chiseled_deepslate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_glazed_terracotta.png new file mode 100644 index 00000000..b42a6b1d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_packed_terracotta.png new file mode 100644 index 00000000..f49b8874 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_planks.png new file mode 100644 index 00000000..e0c0a69f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_terracotta_bricks.png new file mode 100644 index 00000000..707a35e2 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_blue_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_glazed_terracotta.png new file mode 100644 index 00000000..d988fff3 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_packed_terracotta.png new file mode 100644 index 00000000..8e0fea36 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_planks.png new file mode 100644 index 00000000..76166d01 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_terracotta_bricks.png new file mode 100644 index 00000000..cd8efcf9 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/light_gray_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/lime_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_glazed_terracotta.png new file mode 100644 index 00000000..67b66de0 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/lime_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_packed_terracotta.png new file mode 100644 index 00000000..80df8dbe Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/lime_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_planks.png new file mode 100644 index 00000000..ca872a27 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/lime_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_terracotta_bricks.png new file mode 100644 index 00000000..0c16459d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/lime_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/limestone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/limestone.png new file mode 100644 index 00000000..99753d9d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/limestone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/limestone_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/limestone_tiles.png new file mode 100644 index 00000000..29b29d0c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/limestone_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_glazed_terracotta.png new file mode 100644 index 00000000..15531abb Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_packed_terracotta.png new file mode 100644 index 00000000..5493005d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_planks.png new file mode 100644 index 00000000..9436273f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_terracotta_bricks.png new file mode 100644 index 00000000..6aff178d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/magenta_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/netherite_block.png b/desktopRuntime/resources/assets/starlike/textures/blocks/netherite_block.png new file mode 100644 index 00000000..1e13d048 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/netherite_block.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/orange_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_glazed_terracotta.png new file mode 100644 index 00000000..bef13096 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/orange_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_packed_terracotta.png new file mode 100644 index 00000000..5de1065f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/orange_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_planks.png new file mode 100644 index 00000000..877a5aa4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/orange_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_terracotta_bricks.png new file mode 100644 index 00000000..7361a6e1 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/orange_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/ornate_red_sandstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/ornate_red_sandstone.png new file mode 100644 index 00000000..0aaedcfe Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/ornate_red_sandstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/ornate_sandstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/ornate_sandstone.png new file mode 100644 index 00000000..2a3fbe74 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/ornate_sandstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_chiseled_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_chiseled_copper.png new file mode 100644 index 00000000..bb8b9025 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_chiseled_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_copper.png new file mode 100644 index 00000000..b049d6c4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_copper_grate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_copper_grate.png new file mode 100644 index 00000000..1cb5779c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_copper_grate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_cut_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_cut_copper.png new file mode 100644 index 00000000..881ecdea Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/oxidized_cut_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/packed_terracotta.png new file mode 100644 index 00000000..91d2f4ea Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/pink_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_glazed_terracotta.png new file mode 100644 index 00000000..95e3c10c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/pink_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_packed_terracotta.png new file mode 100644 index 00000000..576667b5 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/pink_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_planks.png new file mode 100644 index 00000000..3699072c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/pink_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_terracotta_bricks.png new file mode 100644 index 00000000..6f337b27 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/pink_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/polished_andesite_brick.png b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_andesite_brick.png new file mode 100644 index 00000000..1401f071 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_andesite_brick.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/polished_blackstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_blackstone.png new file mode 100644 index 00000000..020dbb0d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_blackstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/polished_blackstone_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_blackstone_bricks.png new file mode 100644 index 00000000..9177ea1a Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_blackstone_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/polished_diorite_brick.png b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_diorite_brick.png new file mode 100644 index 00000000..aa7e3b1f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_diorite_brick.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/polished_granite_brick.png b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_granite_brick.png new file mode 100644 index 00000000..8929dc01 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_granite_brick.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/polished_tuff.png b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_tuff.png new file mode 100644 index 00000000..1c59a222 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/polished_tuff.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/purple_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_glazed_terracotta.png new file mode 100644 index 00000000..7dcd1f16 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/purple_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_packed_terracotta.png new file mode 100644 index 00000000..f8ac7558 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/purple_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_planks.png new file mode 100644 index 00000000..055e53b6 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/purple_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_terracotta_bricks.png new file mode 100644 index 00000000..2b95ebc7 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/purple_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/raw_copper_block.png b/desktopRuntime/resources/assets/starlike/textures/blocks/raw_copper_block.png new file mode 100644 index 00000000..c0b9f4f0 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/raw_copper_block.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/red_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/red_glazed_terracotta.png new file mode 100644 index 00000000..49e40971 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/red_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/red_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/red_packed_terracotta.png new file mode 100644 index 00000000..0f50aca3 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/red_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/red_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/red_planks.png new file mode 100644 index 00000000..16434fb0 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/red_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/red_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/red_terracotta_bricks.png new file mode 100644 index 00000000..056791d1 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/red_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/skeleton_chiseled_red_sandstone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/skeleton_chiseled_red_sandstone.png new file mode 100644 index 00000000..c9aca5e4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/skeleton_chiseled_red_sandstone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_bottom.png b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_bottom.png new file mode 100644 index 00000000..500c55e8 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_bottom.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_front.png b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_front.png new file mode 100644 index 00000000..d9858426 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_front.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_side.png b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_side.png new file mode 100644 index 00000000..8c56d532 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_side.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_top.png b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_top.png new file mode 100644 index 00000000..29dcd3b9 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/smithing_table_top.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/smooth_basalt.png b/desktopRuntime/resources/assets/starlike/textures/blocks/smooth_basalt.png new file mode 100644 index 00000000..b44ae46c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/smooth_basalt.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/soul_stone.png b/desktopRuntime/resources/assets/starlike/textures/blocks/soul_stone.png new file mode 100644 index 00000000..6d13f5db Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/soul_stone.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/soul_stone_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/soul_stone_tiles.png new file mode 100644 index 00000000..434fb27b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/soul_stone_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/stone_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/stone_tiles.png new file mode 100644 index 00000000..d977d497 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/stone_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/terracotta_bricks.png new file mode 100644 index 00000000..47912936 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/tuff.png b/desktopRuntime/resources/assets/starlike/textures/blocks/tuff.png new file mode 100644 index 00000000..c38e55e7 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/tuff.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/tuff_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/tuff_bricks.png new file mode 100644 index 00000000..19092e6e Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/tuff_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/tuff_tiles.png b/desktopRuntime/resources/assets/starlike/textures/blocks/tuff_tiles.png new file mode 100644 index 00000000..fcf8ee05 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/tuff_tiles.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_chiseled_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_chiseled_copper.png new file mode 100644 index 00000000..e072ee2a Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_chiseled_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_copper.png new file mode 100644 index 00000000..f4f842bd Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_copper_grate.png b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_copper_grate.png new file mode 100644 index 00000000..20952131 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_copper_grate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_cut_copper.png b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_cut_copper.png new file mode 100644 index 00000000..87c0d2aa Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/weathered_cut_copper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/white_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/white_glazed_terracotta.png new file mode 100644 index 00000000..eb86cba2 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/white_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/white_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/white_packed_terracotta.png new file mode 100644 index 00000000..772fb1c0 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/white_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/white_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/white_planks.png new file mode 100644 index 00000000..3a427e55 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/white_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/white_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/white_terracotta_bricks.png new file mode 100644 index 00000000..77415059 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/white_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_glazed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_glazed_terracotta.png new file mode 100644 index 00000000..f1b93fe4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_glazed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_packed_terracotta.png b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_packed_terracotta.png new file mode 100644 index 00000000..1ac933d7 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_packed_terracotta.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_planks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_planks.png new file mode 100644 index 00000000..38fea4c4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_planks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_terracotta_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_terracotta_bricks.png new file mode 100644 index 00000000..c7376a3b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/yellow_terracotta_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/blocks/zombie_chiseled_stone_bricks.png b/desktopRuntime/resources/assets/starlike/textures/blocks/zombie_chiseled_stone_bricks.png new file mode 100644 index 00000000..cd714fa8 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/blocks/zombie_chiseled_stone_bricks.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/entity/endcreeper/creeper.png b/desktopRuntime/resources/assets/starlike/textures/entity/endcreeper/creeper.png new file mode 100644 index 00000000..02df452c Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/entity/endcreeper/creeper.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/container/fabricator.png b/desktopRuntime/resources/assets/starlike/textures/gui/container/fabricator.png new file mode 100644 index 00000000..2832680d Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/gui/container/fabricator.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/container/smithing.png b/desktopRuntime/resources/assets/starlike/textures/gui/container/smithing.png new file mode 100644 index 00000000..64e12e00 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/gui/container/smithing.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/enable_blur.txt b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/enable_blur.txt deleted file mode 100644 index 3fd898dc..00000000 --- a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/enable_blur.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Change to 0 to disable blur -enable_blur=1 \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_0.png b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_0.png deleted file mode 100644 index 27f015d1..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_0.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_1.png b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_1.png deleted file mode 100644 index c16841ad..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_1.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_2.png b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_2.png deleted file mode 100644 index 0436d776..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_2.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_3.png b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_3.png deleted file mode 100644 index 2c7ad778..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_3.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_4.png b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_4.png deleted file mode 100644 index 03900967..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_4.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_5.png b/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_5.png deleted file mode 100644 index 0331ad4a..00000000 Binary files a/desktopRuntime/resources/assets/starlike/textures/gui/title/background/panorama_5.png and /dev/null differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/chisel.png b/desktopRuntime/resources/assets/starlike/textures/items/chisel.png new file mode 100644 index 00000000..8a51827e Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/chisel.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/copper_ingot.png b/desktopRuntime/resources/assets/starlike/textures/items/copper_ingot.png new file mode 100644 index 00000000..3774bab4 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/copper_ingot.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/dragonite.png b/desktopRuntime/resources/assets/starlike/textures/items/dragonite.png new file mode 100644 index 00000000..62416d15 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/dragonite.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_axe.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_axe.png new file mode 100644 index 00000000..322bf451 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_axe.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_boots.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_boots.png new file mode 100644 index 00000000..ec4183ed Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_boots.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_chestplate.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_chestplate.png new file mode 100644 index 00000000..3ab6ee1f Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_chestplate.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_helmet.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_helmet.png new file mode 100644 index 00000000..17bf7f80 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_helmet.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_hoe.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_hoe.png new file mode 100644 index 00000000..b41b1eef Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_hoe.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_ingot.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_ingot.png new file mode 100644 index 00000000..501acdbd Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_ingot.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_leggings.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_leggings.png new file mode 100644 index 00000000..af45363b Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_leggings.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_pickaxe.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_pickaxe.png new file mode 100644 index 00000000..c77e2a71 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_pickaxe.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_scrap.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_scrap.png new file mode 100644 index 00000000..83a98084 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_scrap.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_shovel.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_shovel.png new file mode 100644 index 00000000..0cbaf61a Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_shovel.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/items/netherite_sword.png b/desktopRuntime/resources/assets/starlike/textures/items/netherite_sword.png new file mode 100644 index 00000000..c0b3a344 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/items/netherite_sword.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/models/armor/netherite_layer_1.png b/desktopRuntime/resources/assets/starlike/textures/models/armor/netherite_layer_1.png new file mode 100644 index 00000000..11c961e8 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/models/armor/netherite_layer_1.png differ diff --git a/desktopRuntime/resources/assets/starlike/textures/models/armor/netherite_layer_2.png b/desktopRuntime/resources/assets/starlike/textures/models/armor/netherite_layer_2.png new file mode 100644 index 00000000..526c7be1 Binary files /dev/null and b/desktopRuntime/resources/assets/starlike/textures/models/armor/netherite_layer_2.png differ diff --git a/desktopRuntime/resources/plugin_download.zip b/desktopRuntime/resources/plugin_download.zip index 5bcead9c..42d0bf72 100644 Binary files a/desktopRuntime/resources/plugin_download.zip and b/desktopRuntime/resources/plugin_download.zip differ diff --git a/desktopRuntime/resources/plugin_version.json b/desktopRuntime/resources/plugin_version.json index 29ece09a..c1764ce4 100644 --- a/desktopRuntime/resources/plugin_version.json +++ b/desktopRuntime/resources/plugin_version.json @@ -1 +1 @@ -{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.1","pluginButton":"Download \"EaglerXBungee-1.3.1.jar\"","pluginFilename":"EaglerXBungee.zip"} \ No newline at end of file +{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.2","pluginButton":"Download \"EaglerXBungee-1.3.2.jar\"","pluginFilename":"EaglerXBungee.zip"} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc29..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0e..df97d72b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,80 +15,116 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,87 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d9..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,100 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/javascript/index.html b/javascript/index.html index a576f6bf..dd4a1329 100644 --- a/javascript/index.html +++ b/javascript/index.html @@ -15,7 +15,7 @@ window.eaglercraftXOpts = { container: "game_frame", assetsURI: "assets.epk", - enableSignatureBadge: false + downloadOfflineButtonLink: "https://starlike.orionzleon.me/offline.html" }; var q = window.location.search; diff --git a/src/game/java/net/minecraft/block/Block.java b/src/game/java/net/minecraft/block/Block.java index 38110a40..c75457b1 100644 --- a/src/game/java/net/minecraft/block/Block.java +++ b/src/game/java/net/minecraft/block/Block.java @@ -33,6 +33,8 @@ import net.minecraft.util.Vec3; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.starlikeclient.StarlikeSettings; +import net.starlikeclient.minecraft.init.ItemsStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -162,7 +164,6 @@ public class Block { BlockHugeMushroom.bootstrapStates(); BlockLever.bootstrapStates(); BlockLog.bootstrapStates(); - BlockMosaic.bootstrapStates(); BlockNewLeaf.bootstrapStates(); BlockNewLog.bootstrapStates(); BlockOldLeaf.bootstrapStates(); @@ -192,7 +193,6 @@ public class Block { BlockTrapDoor.bootstrapStates(); BlockWall.bootstrapStates(); BlockWoodSlab.bootstrapStates(); - } public static Block getBlockById(int id) { @@ -224,7 +224,7 @@ public class Block { * + Get a BlockState by it's ID (see getStateId) */ public static IBlockState getStateById(int id) { - int i = id & 4095; + int i = id & (StarlikeSettings.blockIdLimit - 1); int j = id >> 12 & 15; return getBlockById(i).getStateFromMeta(j); } @@ -246,7 +246,7 @@ public class Block { blockRegistry.register(id, textualID, block_); } - private static void registerBlock(int id, String textualID, Block block_) { + public static void registerBlock(int id, String textualID, Block block_) { registerBlock(id, new ResourceLocation(textualID), block_); } @@ -692,45 +692,8 @@ public class Block { registerBlock(197, (String) "dark_oak_door", (new BlockDoor(Material.wood)).setHardness(3.0F) .setStepSound(soundTypeWood).setUnlocalizedName("doorDarkOak").disableStats()); - registerBlock(512, (String) "starlike:deepstone", - (new BlockDeepstone()).setHardness(3.0F).setResistance(10.0F).setStepSound(soundTypePiston) - .setUnlocalizedName("deepstone").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(513, (String) "starlike:cobbled_deepstone", - (new Block(Material.rock)).setHardness(3.5F).setResistance(10.0F).setStepSound(soundTypePiston) - .setUnlocalizedName("cobbled_deepstone").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(514, (String) "starlike:steel_block", - (new Block(Material.iron, MapColor.ironColor)).setHardness(5.0F).setResistance(10.0F) - .setStepSound(soundTypeMetal).setUnlocalizedName("steel_block") - .setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(515, (String) "starlike:steel_grate", - (new BlockSteelGrate()).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal) - .setUnlocalizedName("steel_grate").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(516, (String) "starlike:platinum_ore", - (new BlockOre()).setHardness(50.0F).setResistance(250.0F).setStepSound(soundTypePiston) - .setUnlocalizedName("platinum_ore").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(517, (String) "starlike:platinum_block", - (new Block(Material.iron, MapColor.ironColor)).setHardness(15.0F).setResistance(30.0F) - .setStepSound(soundTypeMetal).setUnlocalizedName("platinum_block") - .setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(518, (String) "starlike:titanium_ore", - (new BlockOre()).setHardness(100.0F).setResistance(500.0F).setStepSound(soundTypePiston) - .setUnlocalizedName("titanium_ore").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(519, (String) "starlike:titanium_block", - (new Block(Material.iron, MapColor.ironColor)).setHardness(25.0F).setResistance(50.0F) - .setStepSound(soundTypeMetal).setUnlocalizedName("titanium_block") - .setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(520, (String) "starlike:uranium_ore", - (new BlockOre()).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypePiston) - .setUnlocalizedName("uranium_ore").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(521, (String) "starlike:uranium_block", - (new Block(Material.iron, MapColor.greenColor)).setHardness(40.0F).setResistance(200.0F) - .setStepSound(soundTypeMetal).setUnlocalizedName("uranium_block") - .setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(522, (String) "starlike:mosaic", (new BlockMosaic()).setHardness(2.0F).setResistance(5.0F) - .setStepSound(soundTypeWood).setUnlocalizedName("mosaic").setCreativeTab(CreativeTabs.tabStarlike)); - registerBlock(523, (String) "starlike:fabricator", - (new BlockFabricator()).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypePiston) - .setUnlocalizedName("fabricator").setCreativeTab(CreativeTabs.tabStarlike)); + ItemsStarlike.registerBlocks(); + blockRegistry.validateKey(); for (Block block13 : blockRegistry) { @@ -820,7 +783,7 @@ public class Block { public String unlocalizedName; - protected Block(Material materialIn) { + public Block(Material materialIn) { this(materialIn, materialIn.getMaterialMapColor()); } @@ -1614,7 +1577,7 @@ public class Block { public void setBlockBoundsForItemRender() { } - protected Block setBlockUnbreakable() { + public Block setBlockUnbreakable() { this.setHardness(-1.0F); return this; } @@ -1624,14 +1587,14 @@ public class Block { return this; } - protected final void setDefaultState(IBlockState state) { + public final void setDefaultState(IBlockState state) { this.defaultBlockState = state; } /** * + Sets how many hits it takes to break a block. */ - protected Block setHardness(float hardness) { + public Block setHardness(float hardness) { this.blockHardness = hardness; if (this.blockResistance < hardness * 5.0F) { this.blockResistance = hardness * 5.0F; @@ -1644,7 +1607,7 @@ public class Block { * + Sets the light value that the block emits. Returns resulting block instance * for constructing convenience. Args: level */ - protected Block setLightLevel(float value) { + public Block setLightLevel(float value) { this.lightValue = (int) (15.0F * value); return this; } @@ -1653,7 +1616,7 @@ public class Block { * + Sets how much light is blocked going through this block. Returns the object * for convenience in constructing. */ - protected Block setLightOpacity(int opacity) { + public Block setLightOpacity(int opacity) { this.lightOpacity = opacity; return this; } @@ -1662,7 +1625,7 @@ public class Block { * + Sets the the blocks resistance to explosions. Returns the object for * convenience in constructing. */ - protected Block setResistance(float resistance) { + public Block setResistance(float resistance) { this.blockResistance = resistance * 3.0F; return this; } @@ -1671,7 +1634,7 @@ public class Block { * + Sets the footstep sound for the block. Returns the object for convenience * in constructing. */ - protected Block setStepSound(Block.SoundType sound) { + public Block setStepSound(Block.SoundType sound) { this.stepSound = sound; return this; } @@ -1679,7 +1642,7 @@ public class Block { /** * + Sets whether this block type will receive random update ticks */ - protected Block setTickRandomly(boolean shouldTick) { + public Block setTickRandomly(boolean shouldTick) { this.needsRandomTick = shouldTick; return this; } diff --git a/src/game/java/net/minecraft/block/BlockDeepstone.java b/src/game/java/net/minecraft/block/BlockDeepstone.java deleted file mode 100644 index 7ca17fb6..00000000 --- a/src/game/java/net/minecraft/block/BlockDeepstone.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.minecraft.block; - -import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; - -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public class BlockDeepstone extends Block { - public BlockDeepstone() { - super(Material.rock); - } - - public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { - return this == Blocks.deepstone ? Item.getItemFromBlock(Blocks.cobbled_deepstone) : Item.getItemFromBlock(this); - } -} \ No newline at end of file diff --git a/src/game/java/net/minecraft/block/BlockMobSpawner.java b/src/game/java/net/minecraft/block/BlockMobSpawner.java index cc55574e..0e754f01 100644 --- a/src/game/java/net/minecraft/block/BlockMobSpawner.java +++ b/src/game/java/net/minecraft/block/BlockMobSpawner.java @@ -38,6 +38,10 @@ public class BlockMobSpawner extends BlockContainer { super(Material.rock); } + protected boolean canSilkHarvest() { + return true; + } + /** * + Returns a new instance of a block's tile entity class. Called on placing * the block. diff --git a/src/game/java/net/minecraft/block/BlockNewLog.java b/src/game/java/net/minecraft/block/BlockNewLog.java index 546aec84..2ecc1dff 100644 --- a/src/game/java/net/minecraft/block/BlockNewLog.java +++ b/src/game/java/net/minecraft/block/BlockNewLog.java @@ -86,6 +86,7 @@ public class BlockNewLog extends BlockLog { return MapColor.stoneColor; case DARK_OAK: return BlockPlanks.EnumType.DARK_OAK.func_181070_c(); + } case Y: return blockplanks$enumtype.func_181070_c(); @@ -142,5 +143,6 @@ public class BlockNewLog extends BlockLog { public void getSubBlocks(Item item, CreativeTabs var2, List list) { list.add(new ItemStack(item, 1, BlockPlanks.EnumType.ACACIA.getMetadata() - 4)); list.add(new ItemStack(item, 1, BlockPlanks.EnumType.DARK_OAK.getMetadata() - 4)); + } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/block/BlockSteelGrate.java b/src/game/java/net/minecraft/block/BlockSteelGrate.java deleted file mode 100644 index 629ad39b..00000000 --- a/src/game/java/net/minecraft/block/BlockSteelGrate.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.minecraft.block; - -import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; -import net.minecraft.block.material.Material; -import net.minecraft.util.EnumWorldBlockLayer; - -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public class BlockSteelGrate extends BlockBreakable { - public BlockSteelGrate() { - super(Material.iron, false); - } - - protected boolean canSilkHarvest() { - return true; - } - - public boolean eaglerShadersShouldRenderGlassHighlights() { - return DeferredStateManager.isRenderingGlassHighlights(); - } - - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; - } - - public boolean isFullCube() { - return false; - } - - public int quantityDropped(EaglercraftRandom var1) { - return 1; - } -} \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/LoadingScreenRenderer.java b/src/game/java/net/minecraft/client/LoadingScreenRenderer.java index 74614042..85db9306 100644 --- a/src/game/java/net/minecraft/client/LoadingScreenRenderer.java +++ b/src/game/java/net/minecraft/client/LoadingScreenRenderer.java @@ -206,13 +206,6 @@ public class LoadingScreenRenderer implements IProgressUpdate { (float) (l / 2 - 4 + 8), 16777215); } this.mc.updateDisplay(); - - try { - Thread.yield(); - } catch (Exception var15) { - ; - } - } } } diff --git a/src/game/java/net/minecraft/client/Minecraft.java b/src/game/java/net/minecraft/client/Minecraft.java index 7af3a9ae..19220ef0 100644 --- a/src/game/java/net/minecraft/client/Minecraft.java +++ b/src/game/java/net/minecraft/client/Minecraft.java @@ -41,7 +41,6 @@ import net.lax1dude.eaglercraft.v1_8.futures.FutureTask; import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture; import net.lax1dude.eaglercraft.v1_8.futures.ListenableFutureTask; import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType; -import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput; import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime; import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; @@ -290,7 +289,7 @@ public class Minecraft implements IThreadListener { private TextureManager renderEngine; public PlayerControllerMP playerController; private boolean fullscreen; - private boolean enableGLErrorChecking = true; + private boolean enableGLErrorChecking = false; private boolean hasCrashed; private CrashReport crashReporter; public int displayWidth; @@ -332,7 +331,7 @@ public class Minecraft implements IThreadListener { long systemTime = getSystemTime(); private int joinPlayerCounter; public final FrameTimer field_181542_y = new FrameTimer(); - long field_181543_z = System.nanoTime(); + long field_181543_z = EagRuntime.nanoTime(); private final boolean jvm64bit; private EaglercraftNetworkManager myNetworkManager; private boolean integratedServerIsRunning; @@ -423,6 +422,7 @@ public class Minecraft implements IThreadListener { this.tempDisplayHeight = gameConfig.displayInfo.height; this.fullscreen = gameConfig.displayInfo.fullscreen; this.jvm64bit = isJvm64bit(); + this.enableGLErrorChecking = EagRuntime.getConfiguration().isCheckGLErrors(); String serverToJoin = EagRuntime.getConfiguration().getServerToJoin(); if (serverToJoin != null) { ServerAddress addr = AddressResolver.resolveAddressFromURI(serverToJoin); @@ -573,10 +573,6 @@ public class Minecraft implements IThreadListener { return this.addScheduledTaskFuture(Executors.callable(runnableToSchedule)); } - public boolean areKeysLocked() { - return PlatformInput.lockKeys; - } - /** * + Checks for an OpenGL error. If there is one, prints the error ID and error * string. @@ -1427,7 +1423,7 @@ public class Minecraft implements IThreadListener { * + Called repeatedly from run() */ private void runGameLoop() throws IOException { - long i = System.nanoTime(); + long i = EagRuntime.nanoTime(); if (Display.isCloseRequested()) { this.shutdown(); } @@ -1449,26 +1445,16 @@ public class Minecraft implements IThreadListener { } } - long l = System.nanoTime(); + long l = EagRuntime.nanoTime(); - if (this.timer.elapsedTicks > 1) { - long watchdog = EagRuntime.steadyTimeMillis(); - for (int j = 0; j < this.timer.elapsedTicks; ++j) { - this.runTick(); - if (j < this.timer.elapsedTicks - 1) { - PointerInputAbstraction.runGameLoop(); - } - long millis = EagRuntime.steadyTimeMillis(); - if (millis - watchdog > 50l) { - watchdog = millis; - EagRuntime.immediateContinue(); - } - } - } else if (this.timer.elapsedTicks == 1) { + for (int j = 0; j < this.timer.elapsedTicks; ++j) { this.runTick(); + if (j < this.timer.elapsedTicks - 1) { + PointerInputAbstraction.runGameLoop(); + } } - long i1 = System.nanoTime() - l; + long i1 = EagRuntime.nanoTime() - l; this.checkGLError("Pre render"); this.mcSoundHandler.setListener(this.thePlayer, this.timer.renderPartialTicks); @@ -1497,7 +1483,7 @@ public class Minecraft implements IThreadListener { this.checkGLError("Post render"); ++this.fpsCounter; - long k = System.nanoTime(); + long k = EagRuntime.nanoTime(); this.field_181542_y.func_181747_a(k - this.field_181543_z); this.field_181543_z = k; @@ -1516,9 +1502,9 @@ public class Minecraft implements IThreadListener { this.fpsCounter = 0; } - if (this.isFramerateLimitBelowMax()) { - Display.sync(this.getLimitFramerate()); - } +// if (this.isFramerateLimitBelowMax()) { +// Display.sync(this.getLimitFramerate()); +// } Mouse.tickCursorShape(); } @@ -1761,7 +1747,7 @@ public class Minecraft implements IThreadListener { while (Keyboard.next()) { int k = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey(); - if (k == 0x1D && (areKeysLocked() || isFullScreen())) { + if (k == 0x1D && (Keyboard.areKeysLocked() || isFullScreen())) { KeyBinding.setKeyBindState(gameSettings.keyBindSprint.getKeyCode(), Keyboard.getEventKeyState()); } KeyBinding.setKeyBindState(k, Keyboard.getEventKeyState()); @@ -2267,14 +2253,14 @@ public class Minecraft implements IThreadListener { if (SingleplayerServerController.isWorldRunning()) { SingleplayerServerController.shutdownEaglercraftServer(); while (SingleplayerServerController.getStatusState() == IntegratedServerState.WORLD_UNLOADING) { - EagUtils.sleep(50l); + EagUtils.sleep(50); SingleplayerServerController.runTick(); } } if (SingleplayerServerController.isIntegratedServerWorkerAlive() && SingleplayerServerController.canKillWorker()) { SingleplayerServerController.killWorker(); - EagUtils.sleep(50l); + EagUtils.sleep(50); } } finally { EagRuntime.destroy(); @@ -2408,7 +2394,9 @@ public class Minecraft implements IThreadListener { mainMenu = new GuiConnecting(mainMenu, this, this.serverName, this.serverPort); } - mainMenu = new GuiScreenEditProfile(mainMenu); + if (EagRuntime.getStorage("p") == null) { + mainMenu = new GuiScreenEditProfile(mainMenu); + } if (!EagRuntime.getConfiguration().isForceProfanityFilter() && !gameSettings.hasShownProfanityFilter) { mainMenu = new GuiScreenContentWarning(mainMenu); @@ -2456,7 +2444,11 @@ public class Minecraft implements IThreadListener { } else { this.gameSettings.enableVsync = false; } - Display.update(); + if (!this.gameSettings.enableVsync && this.isFramerateLimitBelowMax()) { + Display.update(this.getLimitFramerate()); + } else { + Display.update(0); + } this.checkWindowResize(); } diff --git a/src/game/java/net/minecraft/client/gui/GuiChat.java b/src/game/java/net/minecraft/client/gui/GuiChat.java index b7e871f7..10b22467 100644 --- a/src/game/java/net/minecraft/client/gui/GuiChat.java +++ b/src/game/java/net/minecraft/client/gui/GuiChat.java @@ -237,7 +237,7 @@ public class GuiChat extends GuiScreenVisualViewport { * (character on the key), keyCode (lwjgl Keyboard key code) */ protected void keyTyped(char parChar1, int parInt1) { - if (parInt1 == 1 && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || this.mc.areKeysLocked())) { + if (parInt1 == 1 && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || Keyboard.areKeysLocked())) { this.mc.displayGuiScreen((GuiScreen) null); } else { this.waitingOnAutocomplete = false; diff --git a/src/game/java/net/minecraft/client/gui/GuiIngameMenu.java b/src/game/java/net/minecraft/client/gui/GuiIngameMenu.java index d455e87c..6d5f8479 100644 --- a/src/game/java/net/minecraft/client/gui/GuiIngameMenu.java +++ b/src/game/java/net/minecraft/client/gui/GuiIngameMenu.java @@ -14,7 +14,7 @@ import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiShareToLan; import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController; import net.lax1dude.eaglercraft.v1_8.update.GuiUpdateCheckerOverlay; import net.lax1dude.eaglercraft.v1_8.voice.GuiVoiceMenu; -import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenPhishingWaring; +import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenPhishingWarning; import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenRecieveServerInfo; import net.lax1dude.eaglercraft.v1_8.webview.GuiScreenServerInfo; import net.minecraft.client.Minecraft; @@ -132,8 +132,8 @@ public class GuiIngameMenu extends GuiScreen { if (PauseMenuCustomizeState.serverInfoURL != null) { GuiScreen screen = GuiScreenServerInfo.createForCurrentState(this, PauseMenuCustomizeState.serverInfoURL); - if (!this.mc.gameSettings.hasHiddenPhishWarning && !GuiScreenPhishingWaring.hasShownMessage) { - screen = new GuiScreenPhishingWaring(screen); + if (!this.mc.gameSettings.hasHiddenPhishWarning && !GuiScreenPhishingWarning.hasShownMessage) { + screen = new GuiScreenPhishingWarning(screen); } this.mc.displayGuiScreen(screen); } @@ -141,8 +141,8 @@ public class GuiIngameMenu extends GuiScreen { case PauseMenuCustomizeState.SERVER_INFO_MODE_SHOW_EMBED_OVER_WS: if (PauseMenuCustomizeState.serverInfoHash != null) { GuiScreen screen = new GuiScreenRecieveServerInfo(this, PauseMenuCustomizeState.serverInfoHash); - if (!this.mc.gameSettings.hasHiddenPhishWarning && !GuiScreenPhishingWaring.hasShownMessage) { - screen = new GuiScreenPhishingWaring(screen); + if (!this.mc.gameSettings.hasHiddenPhishWarning && !GuiScreenPhishingWarning.hasShownMessage) { + screen = new GuiScreenPhishingWarning(screen); } this.mc.displayGuiScreen(screen); } diff --git a/src/game/java/net/minecraft/client/gui/GuiMainMenu.java b/src/game/java/net/minecraft/client/gui/GuiMainMenu.java index 2ddad86c..ee0f7595 100644 --- a/src/game/java/net/minecraft/client/gui/GuiMainMenu.java +++ b/src/game/java/net/minecraft/client/gui/GuiMainMenu.java @@ -97,12 +97,12 @@ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback { * + An array of all the paths to the panorama pictures. */ private static final ResourceLocation[] titlePanoramaPaths = new ResourceLocation[] { - new ResourceLocation("starlike:textures/gui/title/background/panorama_0.png"), - new ResourceLocation("starlike:textures/gui/title/background/panorama_1.png"), - new ResourceLocation("starlike:textures/gui/title/background/panorama_2.png"), - new ResourceLocation("starlike:textures/gui/title/background/panorama_3.png"), - new ResourceLocation("starlike:textures/gui/title/background/panorama_4.png"), - new ResourceLocation("starlike:textures/gui/title/background/panorama_5.png") }; + new ResourceLocation("textures/gui/title/background/panorama_0.png"), + new ResourceLocation("textures/gui/title/background/panorama_1.png"), + new ResourceLocation("textures/gui/title/background/panorama_2.png"), + new ResourceLocation("textures/gui/title/background/panorama_3.png"), + new ResourceLocation("textures/gui/title/background/panorama_4.png"), + new ResourceLocation("textures/gui/title/background/panorama_5.png") }; private static ResourceLocation backgroundTexture = null; private static GuiMainMenu instance = null; diff --git a/src/game/java/net/minecraft/client/gui/GuiMultiplayer.java b/src/game/java/net/minecraft/client/gui/GuiMultiplayer.java index 39c273d3..0caebe6c 100644 --- a/src/game/java/net/minecraft/client/gui/GuiMultiplayer.java +++ b/src/game/java/net/minecraft/client/gui/GuiMultiplayer.java @@ -234,15 +234,27 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback { public void createButtons() { this.buttonList.add(this.btnEditServer = new GuiButton(7, this.width / 2 - 154, this.height - 28, 70, 20, - I18n.format("selectServer.edit", new Object[0]))); + I18n.format("selectServer.edit", new Object[0])) { + { + enabled = false; + } + }); this.buttonList.add(this.btnDeleteServer = new GuiButton(2, this.width / 2 - 74, this.height - 28, 70, 20, - I18n.format("selectServer.delete", new Object[0]))); + I18n.format("selectServer.delete", new Object[0])) { + { + enabled = false; + } + }); this.buttonList.add(this.btnSelectServer = new GuiButton(1, this.width / 2 - 154, this.height - 52, 100, 20, I18n.format("selectServer.select", new Object[0]))); this.buttonList.add(new GuiButton(4, this.width / 2 - 50, this.height - 52, 100, 20, I18n.format("selectServer.direct", new Object[0]))); this.buttonList.add(new GuiButton(3, this.width / 2 + 4 + 50, this.height - 52, 100, 20, - I18n.format("selectServer.add", new Object[0]))); + I18n.format("selectServer.add", new Object[0])) { + { + enabled = false; + } + }); this.buttonList.add(new GuiButton(8, this.width / 2 + 4, this.height - 28, 70, 20, I18n.format("selectServer.refresh", new Object[0]))); this.buttonList.add(new GuiButton(0, this.width / 2 + 4 + 76, this.height - 28, 75, 20, diff --git a/src/game/java/net/minecraft/client/gui/GuiScreen.java b/src/game/java/net/minecraft/client/gui/GuiScreen.java index 2803ee7a..95d0bfeb 100644 --- a/src/game/java/net/minecraft/client/gui/GuiScreen.java +++ b/src/game/java/net/minecraft/client/gui/GuiScreen.java @@ -770,8 +770,8 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback { if (!canCloseGui()) return; if (((this.mc.theWorld == null || this.mc.thePlayer.getHealth() <= 0.0F) && parInt1 == 1) - || parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode() - || (parInt1 == 1 && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || this.mc.areKeysLocked()))) { + || parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode() || (parInt1 == 1 + && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || Keyboard.areKeysLocked()))) { this.mc.displayGuiScreen((GuiScreen) null); if (this.mc.currentScreen == null) { this.mc.setIngameFocus(); diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiBeacon.java b/src/game/java/net/minecraft/client/gui/inventory/GuiBeacon.java index 0cd8a4cb..a303f016 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiBeacon.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiBeacon.java @@ -205,6 +205,7 @@ public class GuiBeacon extends GuiContainer { int j = (this.height - this.ySize) / 2; this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize); this.itemRender.zLevel = 100.0F; + this.itemRender.renderItemAndEffectIntoGUI(new ItemStack(Items.netherite_ingot), i + 42 - 22, j + 109); this.itemRender.renderItemAndEffectIntoGUI(new ItemStack(Items.emerald), i + 42, j + 109); this.itemRender.renderItemAndEffectIntoGUI(new ItemStack(Items.diamond), i + 42 + 22, j + 109); this.itemRender.renderItemAndEffectIntoGUI(new ItemStack(Items.gold_ingot), i + 42 + 44, j + 109); diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java b/src/game/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java index 6ac59aa4..e9bce5c1 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java @@ -94,8 +94,8 @@ public class GuiBrewingStand extends GuiContainer { */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { String s = this.tileBrewingStand.getDisplayName().getUnformattedText(); - this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); + this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 0xFFFFFF); this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 0xFFFFFF); } -} \ No newline at end of file +} diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiChest.java b/src/game/java/net/minecraft/client/gui/inventory/GuiChest.java index 303d0704..d3670d51 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiChest.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiChest.java @@ -67,8 +67,9 @@ public class GuiChest extends GuiContainer { * items). Args : mouseX, mouseY */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { - this.fontRendererObj.drawString(this.lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752); + this.fontRendererObj.drawString(this.lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 0xFFFFFF); this.fontRendererObj.drawString(this.upperChestInventory.getDisplayName().getUnformattedText(), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 0xFFFFFF); } + } \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java b/src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java index b7275328..a9beeca4 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiContainer.java @@ -163,7 +163,7 @@ public abstract class GuiContainer extends GuiScreen { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.pushMatrix(); GlStateManager.translate((float) k, (float) l, 0.0F); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(0.9F, 0.9F, 1.0F, 1.0F); // Light blue (closer to white) GlStateManager.enableRescaleNormal(); this.theSlot = null; short short1 = 240; @@ -375,8 +375,8 @@ public abstract class GuiContainer extends GuiScreen { */ protected void keyTyped(char parChar1, int parInt1) { if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode() - || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode() - || (parInt1 == 1 && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || this.mc.areKeysLocked()))) { + || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode() || (parInt1 == 1 + && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || Keyboard.areKeysLocked()))) { this.mc.thePlayer.closeScreen(); if (this.mc.currentScreen == null) { this.mc.setIngameFocus(); diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java b/src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java index f7cad2aa..4e4f13ca 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java @@ -75,7 +75,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer { } for (int k = 0; k < 9; ++k) { - this.addSlotToContainer(new Slot(inventoryplayer, k, 9 + k * 18, 112)); + this.addSlotToContainer(new Slot(inventoryplayer, k, 9 + k * 18, 113)); } this.scrollTo(0.0F); @@ -258,11 +258,11 @@ public class GuiContainerCreative extends InventoryEffectRenderer { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); int k = this.guiLeft + 175; int l = this.guiTop + 18; - int i1 = l + 112; + int i1 = l + 113; this.mc.getTextureManager().bindTexture(creativeInventoryTabs); if (creativetabs.shouldHidePlayerInventory()) { this.drawTexturedModalRect(k, l + (int) ((float) (i1 - l - 17) * this.currentScroll), - 232 + (this.needsScrollBars() ? 0 : 12), 0, 12, 15); + 232 + (this.needsScrollBars() ? 0 : 13), 0, 13, 15); } this.func_147051_a(creativetabs); @@ -282,9 +282,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer { if (creativetabs.drawInForegroundOfTab()) { GlStateManager.disableBlend(); this.fontRendererObj.drawString(I18n.format(creativetabs.getTranslatedTabLabel(), new Object[0]), 8, 6, - 4210752); + 0xFFFFFF); } - } /** @@ -298,7 +297,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer { int i1 = k + 175; int j1 = l + 18; int k1 = i1 + 14; - int l1 = j1 + 112; + int l1 = j1 + 113; if (!this.wasClicking && flag && i >= i1 && j >= j1 && i < k1 && j < l1) { this.isScrolling = this.needsScrollBars(); } @@ -595,7 +594,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer { this.searchField.setText(""); } - if (parInt1 == getCloseKey() || (parInt1 == 1 && this.mc.areKeysLocked())) { + if (parInt1 == getCloseKey() || (parInt1 == 1 && Keyboard.areKeysLocked())) { mc.displayGuiScreen(null); } else if (!this.checkHotbarKeys(parInt1)) { if (this.searchField.textboxKeyTyped(parChar1, parInt1)) { @@ -774,14 +773,14 @@ public class GuiContainerCreative extends InventoryEffectRenderer { int i1 = k / 9; guicontainercreative$creativeslot.xDisplayPosition = 9 + l * 18; if (j >= 36) { - guicontainercreative$creativeslot.yDisplayPosition = 112; + guicontainercreative$creativeslot.yDisplayPosition = 113; } else { guicontainercreative$creativeslot.yDisplayPosition = 54 + i1 * 18; } } } - this.field_147064_C = new Slot(field_147060_v, 0, 173, 112); + this.field_147064_C = new Slot(field_147060_v, 0, 173, 113); guicontainercreative$containercreative.inventorySlots.add(this.field_147064_C); } else if (i == CreativeTabs.tabInventory.getTabIndex()) { guicontainercreative$containercreative.inventorySlots = this.field_147063_B; diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiCrafting.java b/src/game/java/net/minecraft/client/gui/inventory/GuiCrafting.java index 2265fde6..5c7a2ed7 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiCrafting.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiCrafting.java @@ -59,8 +59,9 @@ public class GuiCrafting extends GuiContainer { * items). Args : mouseX, mouseY */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { - this.fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 0xFFFFFF); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, - 4210752); + 0xFFFFFF); } + } \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiDispenser.java b/src/game/java/net/minecraft/client/gui/inventory/GuiDispenser.java index c617abb7..39940aae 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiDispenser.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiDispenser.java @@ -58,8 +58,9 @@ public class GuiDispenser extends GuiContainer { */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { String s = this.dispenserInventory.getDisplayName().getUnformattedText(); - this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); + this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 0xFFFFFF); this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 0xFFFFFF); } + } \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java b/src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java index bf7e2bf3..b47e831f 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiEditSign.java @@ -73,6 +73,7 @@ public class GuiEditSign extends GuiScreenVisualViewport { this.drawDefaultBackground(); this.drawCenteredString(this.fontRendererObj, I18n.format("sign.edit", new Object[0]), this.width / 2, 40, 16777215); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.pushMatrix(); GlStateManager.translate((float) (this.width / 2), 0.0F, 50.0F); @@ -80,6 +81,7 @@ public class GuiEditSign extends GuiScreenVisualViewport { GlStateManager.scale(-f1, -f1, -f1); GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); Block block = this.tileSign.getBlockType(); + if (block == Blocks.standing_sign) { float f2 = (float) (this.tileSign.getBlockMetadata() * 360) / 16.0F; GlStateManager.rotate(f2, 0.0F, 1.0F, 0.0F); @@ -90,15 +92,12 @@ public class GuiEditSign extends GuiScreenVisualViewport { if (k == 2) { f3 = 180.0F; } - if (k == 4) { f3 = 90.0F; } - if (k == 5) { f3 = -90.0F; } - GlStateManager.rotate(f3, 0.0F, 1.0F, 0.0F); GlStateManager.translate(0.0F, -1.0625F, 0.0F); } @@ -117,6 +116,7 @@ public class GuiEditSign extends GuiScreenVisualViewport { } finally { TileEntitySignRenderer.disableProfanityFilter = false; } + this.tileSign.lineBeingEdited = -1; GlStateManager.popMatrix(); super.drawScreen0(i, j, f); diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiFurnace.java b/src/game/java/net/minecraft/client/gui/inventory/GuiFurnace.java index 38423210..450813ef 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiFurnace.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiFurnace.java @@ -66,9 +66,9 @@ public class GuiFurnace extends GuiContainer { */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { String s = this.tileFurnace.getDisplayName().getUnformattedText(); - this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); + this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 0xFFFFFF); this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 0xFFFFFF); } private int getBurnLeftScaled(int pixels) { diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiInventory.java b/src/game/java/net/minecraft/client/gui/inventory/GuiInventory.java index 9eb124ce..52525a38 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiInventory.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiInventory.java @@ -125,7 +125,7 @@ public class GuiInventory extends InventoryEffectRenderer { * items). Args : mouseX, mouseY */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { - this.fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 86, 16, 4210752); + this.fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 86, 16, 0xFFFFFF); } /** diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java b/src/game/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java index 81ad97b7..75a189c5 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java +++ b/src/game/java/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java @@ -72,9 +72,9 @@ public class GuiScreenHorseInventory extends GuiContainer { * items). Args : mouseX, mouseY */ protected void drawGuiContainerForegroundLayer(int var1, int var2) { - this.fontRendererObj.drawString(this.horseInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752); + this.fontRendererObj.drawString(this.horseInventory.getDisplayName().getUnformattedText(), 8, 6, 0xFFFFFF); this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 0xFFFFFF); } /** diff --git a/src/game/java/net/minecraft/client/main/Main.java b/src/game/java/net/minecraft/client/main/Main.java index 3baf0b52..7437c1c2 100644 --- a/src/game/java/net/minecraft/client/main/Main.java +++ b/src/game/java/net/minecraft/client/main/Main.java @@ -28,7 +28,7 @@ import net.minecraft.util.Session; * */ public class Main { - public static void appMain(String[] astring) { + public static void appMain() { System.setProperty("java.net.preferIPv6Addresses", "true"); GameConfiguration gameconfiguration = new GameConfiguration( new GameConfiguration.UserInformation(new Session()), diff --git a/src/game/java/net/minecraft/client/renderer/EntityRenderer.java b/src/game/java/net/minecraft/client/renderer/EntityRenderer.java index b7cb3050..dacca1a7 100644 --- a/src/game/java/net/minecraft/client/renderer/EntityRenderer.java +++ b/src/game/java/net/minecraft/client/renderer/EntityRenderer.java @@ -1281,10 +1281,10 @@ public class EntityRenderer implements IResourceManagerReloadListener { if (this.mc.theWorld != null) { int i = Math.min(Minecraft.getDebugFPS(), l1); i = Math.max(i, 60); - long j = System.nanoTime() - parLong1; + long j = EagRuntime.nanoTime() - parLong1; long k = Math.max((long) (1000000000 / i / 4) - j, 0L); - this.renderWorld(parFloat1, System.nanoTime() + k); - this.renderEndNanoTime = System.nanoTime(); + this.renderWorld(parFloat1, EagRuntime.nanoTime() + k); + this.renderEndNanoTime = EagRuntime.nanoTime(); final boolean b = !this.mc.gameSettings.hideGUI || this.mc.currentScreen != null; if (b) { GlStateManager.alphaFunc(GL_GREATER, 0.1F); @@ -1340,7 +1340,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { GlStateManager.matrixMode(GL_MODELVIEW); GlStateManager.loadIdentity(); this.setupOverlayRendering(); - this.renderEndNanoTime = System.nanoTime(); + this.renderEndNanoTime = EagRuntime.nanoTime(); } this.mc.notifRenderer.renderOverlay(j1, k1); diff --git a/src/game/java/net/minecraft/client/renderer/ItemRenderer.java b/src/game/java/net/minecraft/client/renderer/ItemRenderer.java index e0a95133..d81e1897 100644 --- a/src/game/java/net/minecraft/client/renderer/ItemRenderer.java +++ b/src/game/java/net/minecraft/client/renderer/ItemRenderer.java @@ -222,6 +222,31 @@ public class ItemRenderer { return blockIn != null && blockIn.getBlockLayer() == EnumWorldBlockLayer.TRANSLUCENT; } + private void renderChiselAnimation(float clientPlayer, AbstractClientPlayer player) { + GlStateManager.rotate(-10.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(5.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-10.0F, 1.0F, 0.0F, 0.0F); + + float useDuration = (float) this.itemToRender.getMaxItemUseDuration() + - ((float) player.getItemInUseCount() - clientPlayer + 1.0F); + float chiselProgress = useDuration / 20.0F; + chiselProgress = (chiselProgress * chiselProgress + chiselProgress * 2.0F) / 3.0F; + + if (chiselProgress > 1.0F) { + chiselProgress = 1.0F; + } + + if (chiselProgress > 0.1F) { + float chiselEffect = MathHelper.sin((useDuration - 0.1F) * 1.5F); + float motionAmount = chiselProgress - 0.1F; + float forwardMotion = chiselEffect * motionAmount; + + GlStateManager.translate(forwardMotion * 0.0F, forwardMotion * 0.0F, forwardMotion * 0.1F); + } + + GlStateManager.scale(1.0F, 1.0F, 1.0F + chiselProgress * 0.1F); + } + /** * + Renders the fire on the screen for first person mode. Arg: partialTickTime */ @@ -327,6 +352,11 @@ public class ItemRenderer { case BOW: this.transformFirstPersonItem(f, 0.0F); this.func_178098_a(partialTicks, entityplayersp); + break; + case CHISEL: + this.renderChiselAnimation(f, entityplayersp); + this.transformFirstPersonItem(f, 0.0F); + break; } } else { this.func_178105_d(f1); diff --git a/src/game/java/net/minecraft/client/renderer/entity/RenderItem.java b/src/game/java/net/minecraft/client/renderer/entity/RenderItem.java index e2b9e7ed..45abc2bf 100644 --- a/src/game/java/net/minecraft/client/renderer/entity/RenderItem.java +++ b/src/game/java/net/minecraft/client/renderer/entity/RenderItem.java @@ -27,7 +27,6 @@ import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockHugeMushroom; -import net.minecraft.block.BlockMosaic; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockPrismarine; import net.minecraft.block.BlockQuartz; @@ -78,6 +77,7 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3i; +import net.starlikeclient.minecraft.init.ItemsStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -185,11 +185,11 @@ public class RenderItem implements IResourceManagerReloadListener { renderer.putNormal((float) vec3i.getX(), (float) vec3i.getY(), (float) vec3i.getZ()); } - protected void registerBlock(Block blk, int subType, String identifier) { + public void registerBlock(Block blk, int subType, String identifier) { this.registerItem(Item.getItemFromBlock(blk), subType, identifier); } - private void registerBlock(Block blk, String identifier) { + public void registerBlock(Block blk, String identifier) { this.registerBlock(blk, 0, identifier); } @@ -197,7 +197,7 @@ public class RenderItem implements IResourceManagerReloadListener { this.itemModelMesher.register(itm, subType, new ModelResourceLocation(identifier, "inventory")); } - private void registerItem(Item itm, String identifier) { + public void registerItem(Item itm, String identifier) { this.registerItem(itm, 0, identifier); } @@ -762,40 +762,7 @@ public class RenderItem implements IResourceManagerReloadListener { "red_mushroom_block"); this.registerBlock(Blocks.dragon_egg, "dragon_egg"); - this.registerBlock(Blocks.deepstone, "starlike:deepstone"); - this.registerBlock(Blocks.cobbled_deepstone, "starlike:cobbled_deepstone"); - this.registerBlock(Blocks.steel_block, "starlike:steel_block"); - this.registerBlock(Blocks.steel_grate, "starlike:steel_grate"); - this.registerBlock(Blocks.platinum_ore, "starlike:platinum_ore"); - this.registerBlock(Blocks.platinum_block, "starlike:platinum_block"); - this.registerBlock(Blocks.titanium_ore, "starlike:titanium_ore"); - this.registerBlock(Blocks.titanium_block, "starlike:titanium_block"); - this.registerBlock(Blocks.uranium_ore, "starlike:uranium_ore"); - this.registerBlock(Blocks.uranium_block, "starlike:uranium_block"); - this.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.OAK.getMetadata(), "starlike:oak_mosaic"); - this.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.SPRUCE.getMetadata(), "starlike:spruce_mosaic"); - this.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.BIRCH.getMetadata(), "starlike:birch_mosaic"); - this.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.JUNGLE.getMetadata(), "starlike:jungle_mosaic"); - this.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.ACACIA.getMetadata(), "starlike:acacia_mosaic"); - this.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.DARK_OAK.getMetadata(), "starlike:dark_oak_mosaic"); - this.registerBlock(Blocks.fabricator, "starlike:fabricator"); - - this.registerItem(Items.steel, "starlike:steel"); - this.registerItem(Items.platinum_ingot, "starlike:platinum_ingot"); - this.registerItem(Items.platinum_sword, "starlike:platinum_sword"); - this.registerItem(Items.platinum_pickaxe, "starlike:platinum_pickaxe"); - this.registerItem(Items.platinum_shovel, "starlike:platinum_shovel"); - this.registerItem(Items.platinum_axe, "starlike:platinum_axe"); - this.registerItem(Items.platinum_hoe, "starlike:platinum_hoe"); - this.registerItem(Items.platinum_helmet, "starlike:platinum_helmet"); - this.registerItem(Items.platinum_chestplate, "starlike:platinum_chestplate"); - this.registerItem(Items.platinum_leggings, "starlike:platinum_leggings"); - this.registerItem(Items.platinum_boots, "starlike:platinum_boots"); - this.registerItem(Items.titanium_ingot, "starlike:titanium_ingot"); - this.registerItem(Items.uranium_crystal, "starlike:uranium_crystal"); - this.registerItem(Items.uranium_rod, "starlike:uranium_rod"); - this.registerItem(Items.platinum_drill, "starlike:platinum_drill"); - this.registerItem(Items.titanium_drill, "starlike:titanium_drill"); + ItemsStarlike.renderItems(this); } private void renderEffect(IBakedModel model) { diff --git a/src/game/java/net/minecraft/client/renderer/entity/RenderManager.java b/src/game/java/net/minecraft/client/renderer/entity/RenderManager.java index 3dba39df..f1a1534f 100644 --- a/src/game/java/net/minecraft/client/renderer/entity/RenderManager.java +++ b/src/game/java/net/minecraft/client/renderer/entity/RenderManager.java @@ -71,7 +71,6 @@ import net.minecraft.entity.monster.EntityGiantZombie; import net.minecraft.entity.monster.EntityGuardian; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.monster.EntityMagmaCube; -import net.minecraft.entity.monster.EntityNetherCreeper; import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntitySilverfish; import net.minecraft.entity.monster.EntitySkeleton; @@ -108,6 +107,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ReportedException; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.starlikeclient.minecraft.init.EntitiesStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -144,7 +144,7 @@ public class RenderManager { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j / 1.0F, (float) k / 1.0F); } - private Map, Render> entityRenderMap = Maps.newHashMap(); + public Map, Render> entityRenderMap = Maps.newHashMap(); private Map skinMap = Maps.newHashMap(); private RenderPlayer playerRenderer; private RenderPlayer eaglerRenderer; @@ -232,7 +232,8 @@ public class RenderManager { this.entityRenderMap.put(EntityFishHook.class, new RenderFish(this)); this.entityRenderMap.put(EntityHorse.class, new RenderHorse(this, new ModelHorse(), 0.75F)); this.entityRenderMap.put(EntityLightningBolt.class, new RenderLightningBolt(this)); - this.entityRenderMap.put(EntityNetherCreeper.class, new RenderNetherCreeper(this)); + + EntitiesStarlike.renderEntities(this); this.playerRenderer = new RenderPlayer(this); this.skinMap.put("default", this.playerRenderer); diff --git a/src/game/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java index 3e64f85d..65b3d32f 100644 --- a/src/game/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java +++ b/src/game/java/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java @@ -195,6 +195,10 @@ public abstract class LayerArmorBase implements LayerRender DeferredStateManager.setRoughnessConstant(0.078f); DeferredStateManager.setMetalnessConstant(0.588f); break; + case NETHERITE: + DeferredStateManager.setRoughnessConstant(0.085f); + DeferredStateManager.setMetalnessConstant(0.900f); + break; case PLATINUM: DeferredStateManager.setRoughnessConstant(0.129f); DeferredStateManager.setMetalnessConstant(0.913f); @@ -215,6 +219,7 @@ public abstract class LayerArmorBase implements LayerRender case IRON: case GOLD: case DIAMOND: + case NETHERITE: case PLATINUM: GlStateManager.color(this.colorR, this.colorG, this.colorB, this.alpha); modelbase.render(entitylivingbaseIn, armorSlot, parFloat2, parFloat4, parFloat5, parFloat6, parFloat7); diff --git a/src/game/java/net/minecraft/command/CommandClone.java b/src/game/java/net/minecraft/command/CommandClone.java index f1d8a715..48a104e9 100644 --- a/src/game/java/net/minecraft/command/CommandClone.java +++ b/src/game/java/net/minecraft/command/CommandClone.java @@ -16,6 +16,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.NextTickListEntry; import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; +import net.starlikeclient.StarlikeSettings; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -114,9 +115,9 @@ public class CommandClone extends CommandBase { StructureBoundingBox structureboundingbox1 = new StructureBoundingBox(blockpos2, blockpos2.add(structureboundingbox.func_175896_b())); int i = structureboundingbox.getXSize() * structureboundingbox.getYSize() * structureboundingbox.getZSize(); - if (i > '\u8000') { - throw new CommandException("commands.clone.tooManyBlocks", - new Object[] { Integer.valueOf(i), Integer.valueOf('\u8000') }); + if (i > StarlikeSettings.commandModificationBlockLimit) { + throw new CommandException("commands.clone.tooManyBlocks", new Object[] { Integer.valueOf(i), + Integer.valueOf(StarlikeSettings.commandModificationBlockLimit) }); } else { boolean flag = false; Block block = null; diff --git a/src/game/java/net/minecraft/command/CommandFill.java b/src/game/java/net/minecraft/command/CommandFill.java index 457cb80d..620a1207 100644 --- a/src/game/java/net/minecraft/command/CommandFill.java +++ b/src/game/java/net/minecraft/command/CommandFill.java @@ -15,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.starlikeclient.StarlikeSettings; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -104,9 +105,9 @@ public class CommandFill extends CommandBase { Math.max(blockpos.getY(), blockpos1.getY()), Math.max(blockpos.getZ(), blockpos1.getZ())); int j = (blockpos3.getX() - blockpos2.getX() + 1) * (blockpos3.getY() - blockpos2.getY() + 1) * (blockpos3.getZ() - blockpos2.getZ() + 1); - if (j > '\u8000') { - throw new CommandException("commands.fill.tooManyBlocks", - new Object[] { Integer.valueOf(j), Integer.valueOf('\u8000') }); + if (j > StarlikeSettings.commandModificationBlockLimit) { + throw new CommandException("commands.fill.tooManyBlocks", new Object[] { Integer.valueOf(j), + Integer.valueOf(StarlikeSettings.commandModificationBlockLimit) }); } else if (blockpos2.getY() >= 0 && blockpos3.getY() < 256) { World world = parICommandSender.getEntityWorld(); diff --git a/src/game/java/net/minecraft/command/ServerCommandManager.java b/src/game/java/net/minecraft/command/ServerCommandManager.java index 9023a958..538a9436 100644 --- a/src/game/java/net/minecraft/command/ServerCommandManager.java +++ b/src/game/java/net/minecraft/command/ServerCommandManager.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.starlikeclient.minecraft.init.CommandsStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -94,10 +95,9 @@ public class ServerCommandManager extends CommandHandler implements IAdminComman this.registerCommand(new CommandListPlayers()); this.registerCommand(new CommandSetPlayerTimeout()); this.registerCommand(new ClientCommandDummy("eagskull", 2, "command.skull.usage")); - this.registerCommand(new CommandGm(0)); - this.registerCommand(new CommandGm(1)); - this.registerCommand(new CommandGm(2)); - this.registerCommand(new CommandGm(3)); + + CommandsStarlike.registerCommands(this); + CommandBase.setAdminCommander(this); } diff --git a/src/game/java/net/minecraft/creativetab/CreativeTabs.java b/src/game/java/net/minecraft/creativetab/CreativeTabs.java index 2bd517a7..448234a8 100644 --- a/src/game/java/net/minecraft/creativetab/CreativeTabs.java +++ b/src/game/java/net/minecraft/creativetab/CreativeTabs.java @@ -90,7 +90,7 @@ public abstract class CreativeTabs { EnumEnchantmentType.ARMOR_TORSO, EnumEnchantmentType.BOW, EnumEnchantmentType.WEAPON }); public static final CreativeTabs tabBrewing = new CreativeTabs(9, "brewing") { public Item getTabIconItem() { - return Items.potionitem; + return Items.cooked_porkchop; } }; public static final CreativeTabs tabMaterials = new CreativeTabs(10, "materials") { @@ -105,7 +105,7 @@ public abstract class CreativeTabs { }).setBackgroundImageName("inventory.png").setNoScrollbar().setNoTitle(); public static final CreativeTabs tabStarlike = new CreativeTabs(12, "starlike") { public Item getTabIconItem() { - return null; + return Items.titanium_drill; } }; private final int tabIndex; @@ -238,7 +238,7 @@ public abstract class CreativeTabs { * + returns tabIndex < 6 */ public boolean isTabInFirstRow() { - return this.tabIndex < 6; + return this.tabIndex < 7; } public CreativeTabs setBackgroundImageName(String texture) { diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java b/src/game/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java index d8f18a2a..79e1bb54 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentArrowKnockback.java @@ -43,7 +43,7 @@ public class EnchantmentArrowKnockback extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 2; + return 5; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java b/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java index 869e13bc..0332d400 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java @@ -99,7 +99,7 @@ public class EnchantmentDamage extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 7; + return 10; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java b/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java index d1e4351b..0cd309c8 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java @@ -65,7 +65,7 @@ public class EnchantmentDurability extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 5; + return 10; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentKnockback.java b/src/game/java/net/minecraft/enchantment/EnchantmentKnockback.java index c01aab6e..95b3c897 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentKnockback.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentKnockback.java @@ -43,7 +43,7 @@ public class EnchantmentKnockback extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 2; + return 3; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java b/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java index 2cf04d78..f3cf632d 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java @@ -130,7 +130,7 @@ public class EnchantmentProtection extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 8; + return 10; } /** diff --git a/src/game/java/net/minecraft/entity/EntityList.java b/src/game/java/net/minecraft/entity/EntityList.java index 74309ab9..4d27da42 100644 --- a/src/game/java/net/minecraft/entity/EntityList.java +++ b/src/game/java/net/minecraft/entity/EntityList.java @@ -45,7 +45,6 @@ import net.minecraft.entity.monster.EntityGuardian; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.monster.EntityNetherCreeper; import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntitySilverfish; import net.minecraft.entity.monster.EntitySkeleton; @@ -78,6 +77,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; import net.minecraft.world.World; +import net.starlikeclient.minecraft.init.EntitiesStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -202,16 +202,15 @@ public class EntityList { addMapping(EntityRabbit.class, EntityRabbit::new, "Rabbit", 101, 10051392, 7555121); addMapping(EntityVillager.class, EntityVillager::new, "Villager", 120, 5651507, 12422002); addMapping(EntityEnderCrystal.class, EntityEnderCrystal::new, "EnderCrystal", 200); - // Starlike - addMapping(EntityNetherCreeper.class, EntityNetherCreeper::new, "NetherCreeper", 201, 0xFFCC0000, 0xFFFFA500); + EntitiesStarlike.registerEntities(); } /** * + adds a mapping between Entity classes and both a string representation and * an ID */ - private static void addMapping(Class entityClass, + public static void addMapping(Class entityClass, EntityConstructor entityConstructor, String entityName, int id) { if (stringToClassMapping.containsKey(entityName)) { throw new IllegalArgumentException("ID is already registered: " + entityName); @@ -237,7 +236,7 @@ public class EntityList { * + adds a mapping between Entity classes and both a string representation and * an ID */ - private static void addMapping(Class entityClass, + public static void addMapping(Class entityClass, EntityConstructor entityConstructor, String entityName, int entityID, int baseColor, int spotColor) { addMapping(entityClass, entityConstructor, entityName, entityID); diff --git a/src/game/java/net/minecraft/entity/boss/EntityDragon.java b/src/game/java/net/minecraft/entity/boss/EntityDragon.java index fa8b43cc..d406aa24 100644 --- a/src/game/java/net/minecraft/entity/boss/EntityDragon.java +++ b/src/game/java/net/minecraft/entity/boss/EntityDragon.java @@ -6,9 +6,11 @@ import java.util.List; import com.google.common.collect.Lists; +import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -186,6 +188,39 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt } + private void createCrystal(BlockPos basePos) { + int height = 8; + int multiplier = 2; + int maxHeight = height + 1; + for (int i = 0; i < height; i++) { + int width = (height - i - 1) * multiplier / 2; + for (int j = -width; j <= width; j++) { + for (int k = -width; k <= width; k++) { + if (Math.abs(j) + Math.abs(k) <= width) { + BlockPos pos = basePos.add(j, i - 1, k); + this.worldObj.setBlockState(pos, getCrystalRandomState()); + } + } + } + } + BlockPos reverseBasePos = basePos.add(0, -1, 0); + this.worldObj.setBlockState(reverseBasePos, Blocks.dragon_egg.getDefaultState()); + + reverseBasePos = basePos.add(0, -1, 0); + + for (int i = 0; i < height; i++) { + int width = (height - i - 1) * multiplier / 2; + for (int j = -width; j <= width; j++) { + for (int k = -width; k <= width; k++) { + if (Math.abs(j) + Math.abs(k) <= width) { + BlockPos pos = reverseBasePos.add(j, -i - 1, k); + this.worldObj.setBlockState(pos, getCrystalRandomState()); + } + } + } + } + } + /** * + Makes the entity despawn if requirements are reached */ @@ -214,6 +249,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt if (block.getMaterial() != Material.air) { if (block != Blocks.barrier && block != Blocks.obsidian && block != Blocks.end_stone && block != Blocks.bedrock && block != Blocks.command_block + && block != Blocks.dragonite_block && this.worldObj.getGameRules().getBoolean("mobGriefing")) { flag1 = this.worldObj.setBlockToAir(blockpos) || flag1; } else { @@ -244,25 +280,27 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt /** * + Generate the portal when the dragon dies */ - private void generatePortal(BlockPos pos) { - boolean flag = true; - double d0 = 12.25D; - double d1 = 6.25D; + private void generatePortal() { + BlockPos surfacePos = this.worldObj.getTopSolidOrLiquidBlock(new BlockPos(0, 30, 0)); + BlockPos pos = surfacePos.up(); + + System.out.println("genportal"); for (int i = -1; i <= 32; ++i) { - for (int j = -4; j <= 4; ++j) { - for (int k = -4; k <= 4; ++k) { + for (int j = -5; j <= 5; ++j) { + for (int k = -5; k <= 5; ++k) { double d2 = (double) (j * j + k * k); - if (d2 <= 12.25D) { - BlockPos blockpos = pos.add(j, i, k); + BlockPos blockpos = pos.add(j, i, k); + + if (d2 <= 16.0D) { if (i < 0) { - if (d2 <= 6.25D) { - this.worldObj.setBlockState(blockpos, Blocks.bedrock.getDefaultState()); + if (d2 <= 9.0D) { + this.worldObj.setBlockState(blockpos, Blocks.obsidian.getDefaultState()); } } else if (i > 0) { this.worldObj.setBlockState(blockpos, Blocks.air.getDefaultState()); - } else if (d2 > 6.25D) { - this.worldObj.setBlockState(blockpos, Blocks.bedrock.getDefaultState()); + } else if (d2 > 9.0D) { + this.worldObj.setBlockState(blockpos, Blocks.obsidian.getDefaultState()); } else { this.worldObj.setBlockState(blockpos, Blocks.end_portal.getDefaultState()); } @@ -271,10 +309,12 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt } } - this.worldObj.setBlockState(pos, Blocks.bedrock.getDefaultState()); - this.worldObj.setBlockState(pos.up(), Blocks.bedrock.getDefaultState()); + this.worldObj.setBlockState(pos, Blocks.end_stone.getDefaultState()); + this.worldObj.setBlockState(pos.up(), Blocks.end_stone.getDefaultState()); + this.worldObj.setBlockState(pos.up().up(), Blocks.dragon_egg.getDefaultState()); + BlockPos blockpos1 = pos.up(2); - this.worldObj.setBlockState(blockpos1, Blocks.bedrock.getDefaultState()); + this.worldObj.setBlockState(blockpos1, Blocks.end_stone.getDefaultState()); this.worldObj.setBlockState(blockpos1.west(), Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.EAST)); this.worldObj.setBlockState(blockpos1.east(), @@ -283,8 +323,42 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.SOUTH)); this.worldObj.setBlockState(blockpos1.south(), Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.NORTH)); - this.worldObj.setBlockState(pos.up(3), Blocks.bedrock.getDefaultState()); - this.worldObj.setBlockState(pos.up(4), Blocks.dragon_egg.getDefaultState()); + + this.worldObj.setBlockState(pos.up(3), Blocks.end_stone.getDefaultState()); + + BlockPos beaconPos = pos.up(12); + + for (int i = 1; i <= 64; ++i) { + this.worldObj.setBlockState(beaconPos.up(i), Blocks.air.getDefaultState()); + } + + BlockPos basePos = beaconPos.down(); + + this.worldObj.setBlockState(basePos.down(), Blocks.dragon_egg.getDefaultState()); + + BlockPos crystalBase = beaconPos.up(7); + createCrystal(crystalBase); + } + + private IBlockState getCrystalRandomState() { + EaglercraftRandom random = new EaglercraftRandom(); + int rand = random.nextInt(7); + switch (rand) { + case 0: + return Blocks.stained_glass.getStateFromMeta(6); + case 1: + return Blocks.end_stone.getDefaultState(); + case 2: + return Blocks.purple_packed_terracotta.getDefaultState(); + case 3: + return Blocks.stained_glass.getStateFromMeta(6); + case 4: + return Blocks.end_stone.getDefaultState(); + case 5: + return Blocks.dragonite_block.getDefaultState(); + default: + return Blocks.end_stone.getDefaultState(); + } } /** @@ -388,7 +462,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt } } - this.generatePortal(new BlockPos(this.posX, 64.0D, this.posZ)); + this.generatePortal(); this.setDead(); } @@ -398,6 +472,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt * + Called by the /kill command. */ public void onKillCommand() { + this.generatePortal(); this.setDead(); } diff --git a/src/game/java/net/minecraft/entity/monster/EntityZombie.java b/src/game/java/net/minecraft/entity/monster/EntityZombie.java index 2c818f01..6880beab 100644 --- a/src/game/java/net/minecraft/entity/monster/EntityZombie.java +++ b/src/game/java/net/minecraft/entity/monster/EntityZombie.java @@ -109,7 +109,6 @@ public class EntityZombie extends EntityMob { this.tasks.addTask(7, new EntityAIWander(this, 1.0D)); this.tasks.addTask(8, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); this.tasks.addTask(8, new EntityAILookIdle(this)); - this.tasks.addTask(9, new EntityAINearestAttackableTarget(this, EntityNetherCreeper.class, true)); this.applyEntityAI(); this.setSize(0.6F, 1.95F); diff --git a/src/game/java/net/minecraft/entity/player/EntityPlayer.java b/src/game/java/net/minecraft/entity/player/EntityPlayer.java index ee8530d4..57678d3e 100644 --- a/src/game/java/net/minecraft/entity/player/EntityPlayer.java +++ b/src/game/java/net/minecraft/entity/player/EntityPlayer.java @@ -1963,11 +1963,11 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS * + Plays sounds and makes particles for item in use state */ protected void updateItemUse(ItemStack itemStackIn, int parInt1) { - if (itemStackIn.getItemUseAction() == EnumAction.DRINK) { + switch (itemStackIn.getItemUseAction()) { + case DRINK: this.playSound("random.drink", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); - } - - if (itemStackIn.getItemUseAction() == EnumAction.EAT) { + break; + case EAT: for (int i = 0; i < parInt1; ++i) { Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); vec3 = vec3.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); @@ -1990,8 +1990,13 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS this.playSound("random.eat", 0.5F + 0.5F * (float) this.rand.nextInt(2), (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); + break; + case CHISEL: + this.playSound("starlike:random.chisel", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); + break; + default: + break; } - } /** diff --git a/src/game/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/game/java/net/minecraft/entity/player/EntityPlayerMP.java index a624ae92..28625b51 100644 --- a/src/game/java/net/minecraft/entity/player/EntityPlayerMP.java +++ b/src/game/java/net/minecraft/entity/player/EntityPlayerMP.java @@ -171,7 +171,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { * + The entity the player is currently spectating through. */ private Entity spectatingEntity = null; - private int currentWindowId; + public int currentWindowId; public boolean isChangingQuantityOnly; public int ping; public boolean playerConqueredTheEnd; @@ -478,7 +478,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { /** * + get the next window id to use */ - private void getNextWindowId() { + public void getNextWindowId() { this.currentWindowId = this.currentWindowId % 100 + 1; } diff --git a/src/game/java/net/minecraft/init/Blocks.java b/src/game/java/net/minecraft/init/Blocks.java index 2987e2a1..fc16fdfb 100644 --- a/src/game/java/net/minecraft/init/Blocks.java +++ b/src/game/java/net/minecraft/init/Blocks.java @@ -10,7 +10,6 @@ import net.minecraft.block.BlockDaylightDetector; import net.minecraft.block.BlockDeadBush; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockDynamicLiquid; -import net.minecraft.block.BlockFabricator; import net.minecraft.block.BlockFire; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockGrass; @@ -257,8 +256,8 @@ public class Blocks { public static Block red_sandstone_stairs; public static BlockSlab double_stone_slab2; public static BlockSlab stone_slab2; - public static Block deepstone; - public static Block cobbled_deepstone; + public static Block deepslate; + public static Block cobbled_deepslate; public static Block steel_block; public static Block steel_grate; public static Block platinum_ore; @@ -268,8 +267,173 @@ public class Blocks { public static Block uranium_ore; public static Block uranium_block; public static Block mosaic; + public static Block dragonite_block; + public static Block ancient_debris; + public static Block netherite_block; + public static Block smithing_table; public static Block fabricator; +//autogeneratevar + public static Block tuff_tiles; + public static Block soul_stone_tiles; + public static Block soul_stone; + public static Block smooth_basalt; + public static Block limestone_tiles; + public static Block limestone; + public static Block cobbled_soul_stone; + public static Block chiseled_warped_planks; + public static Block chiseled_spruce_planks; + public static Block chiseled_oak_planks; + public static Block chiseled_mangrove_planks; + public static Block chiseled_jungle_planks; + public static Block chiseled_dark_oak_planks; + public static Block chiseled_crimson_planks; + public static Block chiseled_cherry_planks; + public static Block chiseled_birch_planks; + public static Block chiseled_bamboo_planks; + public static Block chiseled_acacia_planks; + public static Block calcite_tiles; + public static Block calcite; + public static Block andesite_tiles; + public static Block polished_blackstone_bricks; + public static Block polished_blackstone; + public static Block gilded_blackstone; + public static Block cracked_polished_blackstone_bricks; + public static Block cracked_blackstone; + public static Block chiseled_polished_blackstone; + public static Block blackstone; + public static Block tuff_bricks; + public static Block tuff; + public static Block polished_tuff; + public static Block chiseled_tuff_top; + public static Block chiseled_tuff_bricks; + public static Block chiseled_tuff; + public static Block polished_granite_brick; + public static Block polished_diorite_brick; + public static Block polished_andesite_brick; + public static Block cobbled_granite; + public static Block cobbled_diorite; + public static Block cobbled_andesite; + public static Block ornate_sandstone; + public static Block ornate_red_sandstone; + public static Block decorated_sandstone; + public static Block decorated_red_sandstone; + public static Block yellow_planks; + public static Block white_planks; + public static Block red_planks; + public static Block purple_planks; + public static Block pink_planks; + public static Block orange_planks; + public static Block magenta_planks; + public static Block lime_planks; + public static Block light_gray_planks; + public static Block light_blue_planks; + public static Block green_planks; + public static Block gray_planks; + public static Block cyan_planks; + public static Block brown_planks; + public static Block blue_planks; + public static Block black_planks; + public static Block yellow_terracotta_bricks; + public static Block yellow_packed_terracotta; + public static Block yellow_glazed_terracotta; + public static Block white_terracotta_bricks; + public static Block white_packed_terracotta; + public static Block white_glazed_terracotta; + public static Block terracotta_bricks; + public static Block red_terracotta_bricks; + public static Block red_packed_terracotta; + public static Block red_glazed_terracotta; + public static Block purple_terracotta_bricks; + public static Block purple_packed_terracotta; + public static Block purple_glazed_terracotta; + public static Block pink_terracotta_bricks; + public static Block pink_packed_terracotta; + public static Block pink_glazed_terracotta; + public static Block packed_terracotta; + public static Block orange_terracotta_bricks; + public static Block orange_packed_terracotta; + public static Block orange_glazed_terracotta; + public static Block magenta_terracotta_bricks; + public static Block magenta_packed_terracotta; + public static Block magenta_glazed_terracotta; + public static Block lime_terracotta_bricks; + public static Block lime_packed_terracotta; + public static Block lime_glazed_terracotta; + public static Block light_gray_terracotta_bricks; + public static Block light_gray_packed_terracotta; + public static Block light_gray_glazed_terracotta; + public static Block light_blue_terracotta_bricks; + public static Block light_blue_packed_terracotta; + public static Block light_blue_glazed_terracotta; + public static Block green_terracotta_bricks; + public static Block green_packed_terracotta; + public static Block green_glazed_terracotta; + public static Block gray_terracotta_bricks; + public static Block gray_packed_terracotta; + public static Block gray_glazed_terracotta; + public static Block cyan_terracotta_bricks; + public static Block cyan_packed_terracotta; + public static Block cyan_glazed_terracotta; + public static Block brown_terracotta_bricks; + public static Block brown_packed_terracotta; + public static Block brown_glazed_terracotta; + public static Block blue_terracotta_bricks; + public static Block blue_packed_terracotta; + public static Block blue_glazed_terracotta; + public static Block black_terracotta_bricks; + public static Block black_packed_terracotta; + public static Block black_glazed_terracotta; + public static Block zombie_chiseled_stone_bricks; + public static Block skeleton_chiseled_red_sandstone; + public static Block head_chiseled_deepslate; + public static Block ghast_chiseled_quartz_block; + public static Block creeper_chiseled_sandstone; + public static Block stone_tiles; + public static Block gold_tiles; + public static Block diorite_tiles; + public static Block deep_ocean_bricks; + public static Block decorated_stripped_spruce_log; + public static Block decorated_stripped_oak_log; + public static Block decorated_stripped_jungle_log; + public static Block decorated_stripped_dark_oak_log; + public static Block decorated_stripped_birch_log; + public static Block decorated_stripped_acacia_log; + public static Block decorated_spruce_planks; + public static Block decorated_spruce_log; + public static Block decorated_oak_planks; + public static Block decorated_oak_log; + public static Block decorated_jungle_planks; + public static Block decorated_jungle_log; + public static Block decorated_dark_oak_planks; + public static Block decorated_dark_oak_log; + public static Block decorated_birch_planks; + public static Block decorated_birch_log; + public static Block decorated_acacia_planks; + public static Block decorated_acacia_log; + public static Block chiseled_deep_ocean_bricks; + public static Block andesite_bricks; + public static Block weathered_cut_copper; + public static Block weathered_copper_grate; + public static Block weathered_copper; + public static Block weathered_chiseled_copper; + public static Block raw_copper_block; + public static Block raw_copper; + public static Block oxidized_cut_copper; + public static Block oxidized_copper_grate; + public static Block oxidized_copper; + public static Block oxidized_chiseled_copper; + public static Block exposed_cut_copper; + public static Block exposed_copper_grate; + public static Block exposed_copper; + public static Block exposed_chiseled_copper; + public static Block deepslate_copper_ore; + public static Block cut_copper; + public static Block copper_ore; + public static Block copper_grate; + public static Block copper_block; + public static Block chiseled_copper; + static void doBootstrap() { if (!Bootstrap.isRegistered()) { throw new RuntimeException("Accessed Blocks before Bootstrap!"); @@ -473,8 +637,8 @@ public class Blocks { double_stone_slab2 = (BlockSlab) getRegisteredBlock("double_stone_slab2"); stone_slab2 = (BlockSlab) getRegisteredBlock("stone_slab2"); - deepstone = getRegisteredBlock("starlike:deepstone"); - cobbled_deepstone = getRegisteredBlock("starlike:cobbled_deepstone"); + deepslate = getRegisteredBlock("starlike:deepslate"); + cobbled_deepslate = getRegisteredBlock("starlike:cobbled_deepslate"); steel_block = getRegisteredBlock("starlike:steel_block"); steel_grate = getRegisteredBlock("starlike:steel_grate"); platinum_ore = getRegisteredBlock("starlike:platinum_ore"); @@ -484,8 +648,172 @@ public class Blocks { uranium_ore = getRegisteredBlock("starlike:uranium_ore"); uranium_block = getRegisteredBlock("starlike:uranium_block"); mosaic = getRegisteredBlock("starlike:mosaic"); - fabricator = (BlockFabricator) getRegisteredBlock("starlike:fabricator"); + dragonite_block = getRegisteredBlock("starlike:dragonite_block"); + ancient_debris = getRegisteredBlock("starlike:ancient_debris"); + netherite_block = getRegisteredBlock("starlike:netherite_block"); + smithing_table = getRegisteredBlock("starlike:smithing_table"); + fabricator = getRegisteredBlock("starlike:fabricator"); +//autogenerateequals + tuff_tiles = getRegisteredBlock("starlike:tuff_tiles"); + soul_stone_tiles = getRegisteredBlock("starlike:soul_stone_tiles"); + soul_stone = getRegisteredBlock("starlike:soul_stone"); + smooth_basalt = getRegisteredBlock("starlike:smooth_basalt"); + limestone_tiles = getRegisteredBlock("starlike:limestone_tiles"); + limestone = getRegisteredBlock("starlike:limestone"); + cobbled_soul_stone = getRegisteredBlock("starlike:cobbled_soul_stone"); + chiseled_warped_planks = getRegisteredBlock("starlike:chiseled_warped_planks"); + chiseled_spruce_planks = getRegisteredBlock("starlike:chiseled_spruce_planks"); + chiseled_oak_planks = getRegisteredBlock("starlike:chiseled_oak_planks"); + chiseled_mangrove_planks = getRegisteredBlock("starlike:chiseled_mangrove_planks"); + chiseled_jungle_planks = getRegisteredBlock("starlike:chiseled_jungle_planks"); + chiseled_dark_oak_planks = getRegisteredBlock("starlike:chiseled_dark_oak_planks"); + chiseled_crimson_planks = getRegisteredBlock("starlike:chiseled_crimson_planks"); + chiseled_cherry_planks = getRegisteredBlock("starlike:chiseled_cherry_planks"); + chiseled_birch_planks = getRegisteredBlock("starlike:chiseled_birch_planks"); + chiseled_bamboo_planks = getRegisteredBlock("starlike:chiseled_bamboo_planks"); + chiseled_acacia_planks = getRegisteredBlock("starlike:chiseled_acacia_planks"); + calcite_tiles = getRegisteredBlock("starlike:calcite_tiles"); + calcite = getRegisteredBlock("starlike:calcite"); + andesite_tiles = getRegisteredBlock("starlike:andesite_tiles"); + polished_blackstone_bricks = getRegisteredBlock("starlike:polished_blackstone_bricks"); + polished_blackstone = getRegisteredBlock("starlike:polished_blackstone"); + gilded_blackstone = getRegisteredBlock("starlike:gilded_blackstone"); + cracked_polished_blackstone_bricks = getRegisteredBlock("starlike:cracked_polished_blackstone_bricks"); + cracked_blackstone = getRegisteredBlock("starlike:cracked_blackstone"); + chiseled_polished_blackstone = getRegisteredBlock("starlike:chiseled_polished_blackstone"); + blackstone = getRegisteredBlock("starlike:blackstone"); + tuff_bricks = getRegisteredBlock("starlike:tuff_bricks"); + tuff = getRegisteredBlock("starlike:tuff"); + polished_tuff = getRegisteredBlock("starlike:polished_tuff"); + chiseled_tuff_top = getRegisteredBlock("starlike:chiseled_tuff_top"); + chiseled_tuff_bricks = getRegisteredBlock("starlike:chiseled_tuff_bricks"); + chiseled_tuff = getRegisteredBlock("starlike:chiseled_tuff"); + polished_granite_brick = getRegisteredBlock("starlike:polished_granite_brick"); + polished_diorite_brick = getRegisteredBlock("starlike:polished_diorite_brick"); + polished_andesite_brick = getRegisteredBlock("starlike:polished_andesite_brick"); + cobbled_granite = getRegisteredBlock("starlike:cobbled_granite"); + cobbled_diorite = getRegisteredBlock("starlike:cobbled_diorite"); + cobbled_andesite = getRegisteredBlock("starlike:cobbled_andesite"); + ornate_sandstone = getRegisteredBlock("starlike:ornate_sandstone"); + ornate_red_sandstone = getRegisteredBlock("starlike:ornate_red_sandstone"); + decorated_sandstone = getRegisteredBlock("starlike:decorated_sandstone"); + decorated_red_sandstone = getRegisteredBlock("starlike:decorated_red_sandstone"); + yellow_planks = getRegisteredBlock("starlike:yellow_planks"); + white_planks = getRegisteredBlock("starlike:white_planks"); + red_planks = getRegisteredBlock("starlike:red_planks"); + purple_planks = getRegisteredBlock("starlike:purple_planks"); + pink_planks = getRegisteredBlock("starlike:pink_planks"); + orange_planks = getRegisteredBlock("starlike:orange_planks"); + magenta_planks = getRegisteredBlock("starlike:magenta_planks"); + lime_planks = getRegisteredBlock("starlike:lime_planks"); + light_gray_planks = getRegisteredBlock("starlike:light_gray_planks"); + light_blue_planks = getRegisteredBlock("starlike:light_blue_planks"); + green_planks = getRegisteredBlock("starlike:green_planks"); + gray_planks = getRegisteredBlock("starlike:gray_planks"); + cyan_planks = getRegisteredBlock("starlike:cyan_planks"); + brown_planks = getRegisteredBlock("starlike:brown_planks"); + blue_planks = getRegisteredBlock("starlike:blue_planks"); + black_planks = getRegisteredBlock("starlike:black_planks"); + yellow_terracotta_bricks = getRegisteredBlock("starlike:yellow_terracotta_bricks"); + yellow_packed_terracotta = getRegisteredBlock("starlike:yellow_packed_terracotta"); + yellow_glazed_terracotta = getRegisteredBlock("starlike:yellow_glazed_terracotta"); + white_terracotta_bricks = getRegisteredBlock("starlike:white_terracotta_bricks"); + white_packed_terracotta = getRegisteredBlock("starlike:white_packed_terracotta"); + white_glazed_terracotta = getRegisteredBlock("starlike:white_glazed_terracotta"); + terracotta_bricks = getRegisteredBlock("starlike:terracotta_bricks"); + red_terracotta_bricks = getRegisteredBlock("starlike:red_terracotta_bricks"); + red_packed_terracotta = getRegisteredBlock("starlike:red_packed_terracotta"); + red_glazed_terracotta = getRegisteredBlock("starlike:red_glazed_terracotta"); + purple_terracotta_bricks = getRegisteredBlock("starlike:purple_terracotta_bricks"); + purple_packed_terracotta = getRegisteredBlock("starlike:purple_packed_terracotta"); + purple_glazed_terracotta = getRegisteredBlock("starlike:purple_glazed_terracotta"); + pink_terracotta_bricks = getRegisteredBlock("starlike:pink_terracotta_bricks"); + pink_packed_terracotta = getRegisteredBlock("starlike:pink_packed_terracotta"); + pink_glazed_terracotta = getRegisteredBlock("starlike:pink_glazed_terracotta"); + packed_terracotta = getRegisteredBlock("starlike:packed_terracotta"); + orange_terracotta_bricks = getRegisteredBlock("starlike:orange_terracotta_bricks"); + orange_packed_terracotta = getRegisteredBlock("starlike:orange_packed_terracotta"); + orange_glazed_terracotta = getRegisteredBlock("starlike:orange_glazed_terracotta"); + magenta_terracotta_bricks = getRegisteredBlock("starlike:magenta_terracotta_bricks"); + magenta_packed_terracotta = getRegisteredBlock("starlike:magenta_packed_terracotta"); + magenta_glazed_terracotta = getRegisteredBlock("starlike:magenta_glazed_terracotta"); + lime_terracotta_bricks = getRegisteredBlock("starlike:lime_terracotta_bricks"); + lime_packed_terracotta = getRegisteredBlock("starlike:lime_packed_terracotta"); + lime_glazed_terracotta = getRegisteredBlock("starlike:lime_glazed_terracotta"); + light_gray_terracotta_bricks = getRegisteredBlock("starlike:light_gray_terracotta_bricks"); + light_gray_packed_terracotta = getRegisteredBlock("starlike:light_gray_packed_terracotta"); + light_gray_glazed_terracotta = getRegisteredBlock("starlike:light_gray_glazed_terracotta"); + light_blue_terracotta_bricks = getRegisteredBlock("starlike:light_blue_terracotta_bricks"); + light_blue_packed_terracotta = getRegisteredBlock("starlike:light_blue_packed_terracotta"); + light_blue_glazed_terracotta = getRegisteredBlock("starlike:light_blue_glazed_terracotta"); + green_terracotta_bricks = getRegisteredBlock("starlike:green_terracotta_bricks"); + green_packed_terracotta = getRegisteredBlock("starlike:green_packed_terracotta"); + green_glazed_terracotta = getRegisteredBlock("starlike:green_glazed_terracotta"); + gray_terracotta_bricks = getRegisteredBlock("starlike:gray_terracotta_bricks"); + gray_packed_terracotta = getRegisteredBlock("starlike:gray_packed_terracotta"); + gray_glazed_terracotta = getRegisteredBlock("starlike:gray_glazed_terracotta"); + cyan_terracotta_bricks = getRegisteredBlock("starlike:cyan_terracotta_bricks"); + cyan_packed_terracotta = getRegisteredBlock("starlike:cyan_packed_terracotta"); + cyan_glazed_terracotta = getRegisteredBlock("starlike:cyan_glazed_terracotta"); + brown_terracotta_bricks = getRegisteredBlock("starlike:brown_terracotta_bricks"); + brown_packed_terracotta = getRegisteredBlock("starlike:brown_packed_terracotta"); + brown_glazed_terracotta = getRegisteredBlock("starlike:brown_glazed_terracotta"); + blue_terracotta_bricks = getRegisteredBlock("starlike:blue_terracotta_bricks"); + blue_packed_terracotta = getRegisteredBlock("starlike:blue_packed_terracotta"); + blue_glazed_terracotta = getRegisteredBlock("starlike:blue_glazed_terracotta"); + black_terracotta_bricks = getRegisteredBlock("starlike:black_terracotta_bricks"); + black_packed_terracotta = getRegisteredBlock("starlike:black_packed_terracotta"); + black_glazed_terracotta = getRegisteredBlock("starlike:black_glazed_terracotta"); + zombie_chiseled_stone_bricks = getRegisteredBlock("starlike:zombie_chiseled_stone_bricks"); + skeleton_chiseled_red_sandstone = getRegisteredBlock("starlike:skeleton_chiseled_red_sandstone"); + head_chiseled_deepslate = getRegisteredBlock("starlike:head_chiseled_deepslate"); + ghast_chiseled_quartz_block = getRegisteredBlock("starlike:ghast_chiseled_quartz_block"); + creeper_chiseled_sandstone = getRegisteredBlock("starlike:creeper_chiseled_sandstone"); + weathered_cut_copper = getRegisteredBlock("starlike:weathered_cut_copper"); + weathered_copper_grate = getRegisteredBlock("starlike:weathered_copper_grate"); + weathered_copper = getRegisteredBlock("starlike:weathered_copper"); + weathered_chiseled_copper = getRegisteredBlock("starlike:weathered_chiseled_copper"); + raw_copper_block = getRegisteredBlock("starlike:raw_copper_block"); + raw_copper = getRegisteredBlock("starlike:raw_copper"); + oxidized_cut_copper = getRegisteredBlock("starlike:oxidized_cut_copper"); + oxidized_copper_grate = getRegisteredBlock("starlike:oxidized_copper_grate"); + oxidized_copper = getRegisteredBlock("starlike:oxidized_copper"); + oxidized_chiseled_copper = getRegisteredBlock("starlike:oxidized_chiseled_copper"); + exposed_cut_copper = getRegisteredBlock("starlike:exposed_cut_copper"); + exposed_copper_grate = getRegisteredBlock("starlike:exposed_copper_grate"); + exposed_copper = getRegisteredBlock("starlike:exposed_copper"); + exposed_chiseled_copper = getRegisteredBlock("starlike:exposed_chiseled_copper"); + deepslate_copper_ore = getRegisteredBlock("starlike:deepslate_copper_ore"); + cut_copper = getRegisteredBlock("starlike:cut_copper"); + copper_ore = getRegisteredBlock("starlike:copper_ore"); + copper_grate = getRegisteredBlock("starlike:copper_grate"); + copper_block = getRegisteredBlock("starlike:copper_block"); + chiseled_copper = getRegisteredBlock("starlike:chiseled_copper"); + stone_tiles = getRegisteredBlock("starlike:stone_tiles"); + gold_tiles = getRegisteredBlock("starlike:gold_tiles"); + diorite_tiles = getRegisteredBlock("starlike:diorite_tiles"); + deep_ocean_bricks = getRegisteredBlock("starlike:deep_ocean_bricks"); + decorated_stripped_spruce_log = getRegisteredBlock("starlike:decorated_stripped_spruce_log"); + decorated_stripped_oak_log = getRegisteredBlock("starlike:decorated_stripped_oak_log"); + decorated_stripped_jungle_log = getRegisteredBlock("starlike:decorated_stripped_jungle_log"); + decorated_stripped_dark_oak_log = getRegisteredBlock("starlike:decorated_stripped_dark_oak_log"); + decorated_stripped_birch_log = getRegisteredBlock("starlike:decorated_stripped_birch_log"); + decorated_stripped_acacia_log = getRegisteredBlock("starlike:decorated_stripped_acacia_log"); + decorated_spruce_planks = getRegisteredBlock("starlike:decorated_spruce_planks"); + decorated_spruce_log = getRegisteredBlock("starlike:decorated_spruce_log"); + decorated_oak_planks = getRegisteredBlock("starlike:decorated_oak_planks"); + decorated_oak_log = getRegisteredBlock("starlike:decorated_oak_log"); + decorated_jungle_planks = getRegisteredBlock("starlike:decorated_jungle_planks"); + decorated_jungle_log = getRegisteredBlock("starlike:decorated_jungle_log"); + decorated_dark_oak_planks = getRegisteredBlock("starlike:decorated_dark_oak_planks"); + decorated_dark_oak_log = getRegisteredBlock("starlike:decorated_dark_oak_log"); + decorated_birch_planks = getRegisteredBlock("starlike:decorated_birch_planks"); + decorated_birch_log = getRegisteredBlock("starlike:decorated_birch_log"); + decorated_acacia_planks = getRegisteredBlock("starlike:decorated_acacia_planks"); + decorated_acacia_log = getRegisteredBlock("starlike:decorated_acacia_log"); + chiseled_deep_ocean_bricks = getRegisteredBlock("starlike:chiseled_deep_ocean_bricks"); + andesite_bricks = getRegisteredBlock("starlike:andesite_bricks"); } } @@ -493,6 +821,7 @@ public class Blocks { * + Returns the Block in the blockRegistry with the specified name. */ private static Block getRegisteredBlock(String parString1) { + return (Block) Block.blockRegistry.getObject(new ResourceLocation(parString1)); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/init/Items.java b/src/game/java/net/minecraft/init/Items.java index 8361e688..6f186794 100644 --- a/src/game/java/net/minecraft/init/Items.java +++ b/src/game/java/net/minecraft/init/Items.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemMap; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemShears; import net.minecraft.util.ResourceLocation; +import net.starlikeclient.minecraft.items.ItemChisel; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -239,6 +240,20 @@ public class Items { public static Item uranium_rod; public static Item platinum_drill; public static Item titanium_drill; + public static Item dragonite; + public static Item copper_ingot; + public static Item netherite_scrap; + public static Item netherite_ingot; + public static Item netherite_sword; + public static Item netherite_shovel; + public static Item netherite_pickaxe; + public static Item netherite_axe; + public static Item netherite_hoe; + public static ItemArmor netherite_helmet; + public static ItemArmor netherite_chestplate; + public static ItemArmor netherite_leggings; + public static ItemArmor netherite_boots; + public static ItemChisel chisel; static void doBootstrap() { if (!Bootstrap.isRegistered()) { @@ -448,6 +463,20 @@ public class Items { uranium_rod = getRegisteredItem("starlike:uranium_rod"); platinum_drill = getRegisteredItem("starlike:platinum_drill"); titanium_drill = getRegisteredItem("starlike:titanium_drill"); + dragonite = getRegisteredItem("starlike:dragonite"); + copper_ingot = getRegisteredItem("starlike:copper_ingot"); + netherite_scrap = getRegisteredItem("starlike:netherite_scrap"); + netherite_ingot = getRegisteredItem("starlike:netherite_ingot"); + netherite_sword = getRegisteredItem("starlike:netherite_sword"); + netherite_shovel = getRegisteredItem("starlike:netherite_shovel"); + netherite_pickaxe = getRegisteredItem("starlike:netherite_pickaxe"); + netherite_axe = getRegisteredItem("starlike:netherite_axe"); + netherite_hoe = getRegisteredItem("starlike:netherite_hoe"); + netherite_helmet = (ItemArmor) getRegisteredItem("starlike:netherite_helmet"); + netherite_chestplate = (ItemArmor) getRegisteredItem("starlike:netherite_chestplate"); + netherite_leggings = (ItemArmor) getRegisteredItem("starlike:netherite_leggings"); + netherite_boots = (ItemArmor) getRegisteredItem("starlike:netherite_boots"); + chisel = (ItemChisel) getRegisteredItem("starlike:chisel"); } } diff --git a/src/game/java/net/minecraft/inventory/Container.java b/src/game/java/net/minecraft/inventory/Container.java index ece9793c..386f1d23 100644 --- a/src/game/java/net/minecraft/inventory/Container.java +++ b/src/game/java/net/minecraft/inventory/Container.java @@ -8,9 +8,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.network.play.server.S30PacketWindowItems; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -334,11 +336,17 @@ public abstract class Container { */ public void onContainerClosed(EntityPlayer playerIn) { InventoryPlayer inventoryplayer = playerIn.inventory; - if (inventoryplayer.getItemStack() != null) { - playerIn.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), false); + ItemStack itemstack = inventoryplayer.getItemStack(); + if (itemstack != null) { + if (!playerIn.inventory.addItemStackToInventory(itemstack)) { + playerIn.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), false); + } inventoryplayer.setItemStack((ItemStack) null); - } + if (!playerIn.worldObj.isRemote) { + ((EntityPlayerMP) playerIn).playerNetServerHandler.sendPacket(new S30PacketWindowItems(playerIn.inventoryContainer.windowId, playerIn.inventoryContainer.getInventory())); + } + } } public void onCraftGuiOpened(ICrafting listener) { diff --git a/src/game/java/net/minecraft/inventory/ContainerBeacon.java b/src/game/java/net/minecraft/inventory/ContainerBeacon.java index 6230ed1a..606b7dd5 100644 --- a/src/game/java/net/minecraft/inventory/ContainerBeacon.java +++ b/src/game/java/net/minecraft/inventory/ContainerBeacon.java @@ -1,8 +1,10 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.network.play.server.S30PacketWindowItems; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -39,8 +41,9 @@ public class ContainerBeacon extends Container { public boolean isItemValid(ItemStack itemstack) { return itemstack == null ? false - : itemstack.getItem() == Items.emerald || itemstack.getItem() == Items.diamond - || itemstack.getItem() == Items.gold_ingot || itemstack.getItem() == Items.iron_ingot; + : itemstack.getItem() == Items.netherite_ingot || itemstack.getItem() == Items.emerald + || itemstack.getItem() == Items.diamond || itemstack.getItem() == Items.gold_ingot + || itemstack.getItem() == Items.iron_ingot; } } @@ -82,9 +85,11 @@ public class ContainerBeacon extends Container { if (entityplayer != null && !entityplayer.worldObj.isRemote) { ItemStack itemstack = this.beaconSlot.decrStackSize(this.beaconSlot.getSlotStackLimit()); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); } - } } diff --git a/src/game/java/net/minecraft/inventory/ContainerEnchantment.java b/src/game/java/net/minecraft/inventory/ContainerEnchantment.java index e98f2353..79f9578e 100644 --- a/src/game/java/net/minecraft/inventory/ContainerEnchantment.java +++ b/src/game/java/net/minecraft/inventory/ContainerEnchantment.java @@ -6,6 +6,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.enchantment.EnchantmentData; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -14,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraft.network.play.server.S30PacketWindowItems; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -196,10 +198,12 @@ public class ContainerEnchantment extends Container { for (int i = 0; i < this.tableInventory.getSizeInventory(); ++i) { ItemStack itemstack = this.tableInventory.removeStackFromSlot(i); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } } } - + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); } } diff --git a/src/game/java/net/minecraft/inventory/ContainerMerchant.java b/src/game/java/net/minecraft/inventory/ContainerMerchant.java index ddb66a30..2f003ebd 100644 --- a/src/game/java/net/minecraft/inventory/ContainerMerchant.java +++ b/src/game/java/net/minecraft/inventory/ContainerMerchant.java @@ -2,8 +2,10 @@ package net.minecraft.inventory; import net.minecraft.entity.IMerchant; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.network.play.server.S30PacketWindowItems; import net.minecraft.world.World; /** @@ -80,13 +82,19 @@ public class ContainerMerchant extends Container { if (!this.theWorld.isRemote) { ItemStack itemstack = this.merchantInventory.removeStackFromSlot(0); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } } itemstack = this.merchantInventory.removeStackFromSlot(1); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } } + + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); } } diff --git a/src/game/java/net/minecraft/inventory/ContainerPlayer.java b/src/game/java/net/minecraft/inventory/ContainerPlayer.java index eae4916f..26a3b2a8 100644 --- a/src/game/java/net/minecraft/inventory/ContainerPlayer.java +++ b/src/game/java/net/minecraft/inventory/ContainerPlayer.java @@ -1,6 +1,7 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -8,6 +9,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.network.play.server.S30PacketWindowItems; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -110,11 +112,17 @@ public class ContainerPlayer extends Container { for (int i = 0; i < 4; ++i) { ItemStack itemstack = this.craftMatrix.removeStackFromSlot(i); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } } } this.craftResult.setInventorySlotContents(0, (ItemStack) null); + + if (!entityplayer.worldObj.isRemote) { + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); + } } /** diff --git a/src/game/java/net/minecraft/inventory/ContainerRepair.java b/src/game/java/net/minecraft/inventory/ContainerRepair.java index a32b9405..110a362a 100644 --- a/src/game/java/net/minecraft/inventory/ContainerRepair.java +++ b/src/game/java/net/minecraft/inventory/ContainerRepair.java @@ -12,12 +12,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraft.network.play.server.S30PacketWindowItems; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -148,10 +150,12 @@ public class ContainerRepair extends Container { for (int i = 0; i < this.inputSlots.getSizeInventory(); ++i) { ItemStack itemstack = this.inputSlots.removeStackFromSlot(i); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } } } - + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); } } diff --git a/src/game/java/net/minecraft/inventory/ContainerWorkbench.java b/src/game/java/net/minecraft/inventory/ContainerWorkbench.java index 7c48d75e..98a1843d 100644 --- a/src/game/java/net/minecraft/inventory/ContainerWorkbench.java +++ b/src/game/java/net/minecraft/inventory/ContainerWorkbench.java @@ -1,10 +1,12 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.network.play.server.S30PacketWindowItems; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -89,9 +91,12 @@ public class ContainerWorkbench extends Container { for (int i = 0; i < 9; ++i) { ItemStack itemstack = this.craftMatrix.removeStackFromSlot(i); if (itemstack != null) { - entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } } } + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); } } diff --git a/src/game/java/net/minecraft/item/EnumAction.java b/src/game/java/net/minecraft/item/EnumAction.java index 6abcaa58..092d4d32 100644 --- a/src/game/java/net/minecraft/item/EnumAction.java +++ b/src/game/java/net/minecraft/item/EnumAction.java @@ -24,5 +24,5 @@ package net.minecraft.item; * */ public enum EnumAction { - NONE, EAT, DRINK, BLOCK, BOW; + NONE, EAT, DRINK, BLOCK, BOW, CHISEL; } \ No newline at end of file diff --git a/src/game/java/net/minecraft/item/Item.java b/src/game/java/net/minecraft/item/Item.java index d8e9091f..b9f8c5b0 100644 --- a/src/game/java/net/minecraft/item/Item.java +++ b/src/game/java/net/minecraft/item/Item.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockMosaic; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockPrismarine; import net.minecraft.block.BlockRedSandstone; @@ -46,6 +45,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.starlikeclient.minecraft.init.ItemsStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -74,10 +74,11 @@ public class Item { public static enum ToolMaterial { // MATERIAL(HARVEST_LEVEL, DURABILITY, EFFICIENCY, DAMAGE, ENCHANTABILITY) WOOD(0, 59, 2.0F, 0.0F, 15), STONE(1, 131, 4.0F, 1.0F, 5), IRON(2, 250, 6.0F, 2.0F, 14), - DIAMOND(3, 1561, 8.0F, 3.0F, 10), GOLD(0, 32, 12.0F, 0.0F, 22), PLATINUM(4, 2000, 10.0F, 4.0F, 12), - PLATINUM_DRILL(4, 2500, 50.0F, 4.0F, 14), TITANIUM_DRILL(5, 4750, 70.0F, 6.0F, 18), - SPEED_DRILL(5, 7500, 200.0F, 6.0F, 18), POWER_DRILL(6, 8500, 50.0F, 6.0F, 18), - LATE_GAME_DRILL(7, 8000, 300.0F, 7.0F, 24), OP_DRILL(8, 15000, 500.0F, 8.0F, 30); + DIAMOND(3, 1561, 8.0F, 3.0F, 10), GOLD(0, 32, 12.0F, 0.0F, 22), NETHERITE(4, 2031, 9.0F, 4.0F, 15), + PLATINUM(5, 2031, 10.0F, 5.0F, 13), PLATINUM_DRILL(5, 2500, 50.0F, 4.0F, 14), + TITANIUM_DRILL(6, 4750, 70.0F, 6.0F, 18), SPEED_DRILL(6, 7500, 200.0F, 6.0F, 18), + POWER_DRILL(7, 8500, 50.0F, 6.0F, 18), LATE_GAME_DRILL(8, 8000, 300.0F, 7.0F, 24), + OP_DRILL(9, 15000, 500.0F, 8.0F, 30); private final int harvestLevel; private final int maxUses; @@ -115,26 +116,31 @@ public class Item { } public Item getRepairItem() { - return this == WOOD ? Item.getItemFromBlock(Blocks.planks) - : (this == STONE ? Item.getItemFromBlock(Blocks.cobblestone) - : (this == GOLD ? Items.gold_ingot - : (this == IRON ? Items.iron_ingot - : (this == DIAMOND ? Items.diamond - : (this == PLATINUM ? Items.platinum_ingot - : (this == PLATINUM_DRILL ? Items.uranium_rod - : (this == PLATINUM_DRILL ? Items.uranium_rod - : (this == TITANIUM_DRILL - ? Items.uranium_rod - : (this == SPEED_DRILL - ? Items.uranium_rod - : (this == POWER_DRILL - ? Items.uranium_rod - : (this == LATE_GAME_DRILL - ? Items.uranium_rod - : (this == OP_DRILL - ? Items.uranium_rod - : null)))))))))))); - + switch (this) { + case WOOD: + return Item.getItemFromBlock(Blocks.planks); + case STONE: + return Item.getItemFromBlock(Blocks.cobblestone); + case GOLD: + return Items.gold_ingot; + case IRON: + return Items.iron_ingot; + case DIAMOND: + return Items.diamond; + case NETHERITE: + return Items.netherite_ingot; + case PLATINUM: + return Items.platinum_ingot; + case PLATINUM_DRILL: + case TITANIUM_DRILL: + case SPEED_DRILL: + case POWER_DRILL: + case LATE_GAME_DRILL: + case OP_DRILL: + return Items.uranium_rod; + default: + return null; + } } } @@ -176,25 +182,25 @@ public class Item { return (Item) BLOCK_TO_ITEM.get(blockIn); } - private static void registerItem(int id, ResourceLocation textualID, Item itemIn) { + public static void registerItem(int id, ResourceLocation textualID, Item itemIn) { itemRegistry.register(id, textualID, itemIn); } - private static void registerItem(int id, String textualID, Item itemIn) { + public static void registerItem(int id, String textualID, Item itemIn) { registerItem(id, new ResourceLocation(textualID), itemIn); } /** * + Register the given Item as the ItemBlock for the given Block. */ - private static void registerItemBlock(Block blockIn) { + public static void registerItemBlock(Block blockIn) { registerItemBlock(blockIn, new ItemBlock(blockIn)); } /** * + Register the given Item as the ItemBlock for the given Block. */ - protected static void registerItemBlock(Block blockIn, Item itemIn) { + public static void registerItemBlock(Block blockIn, Item itemIn) { registerItem(Block.getIdFromBlock(blockIn), (ResourceLocation) Block.blockRegistry.getNameForObject(blockIn), itemIn); BLOCK_TO_ITEM.put(blockIn, itemIn); @@ -627,7 +633,7 @@ public class Item { registerItem(353, (String) "sugar", (new Item()).setUnlocalizedName("sugar") .setPotionEffect(PotionHelper.sugarEffect).setCreativeTab(CreativeTabs.tabMaterials)); registerItem(354, (String) "cake", (new ItemReed(Blocks.cake)).setMaxStackSize(1).setUnlocalizedName("cake") - .setCreativeTab(CreativeTabs.tabFood)); + .setCreativeTab(CreativeTabs.tabBrewing)); registerItem(355, (String) "bed", (new ItemBed()).setMaxStackSize(1).setUnlocalizedName("bed")); registerItem(356, (String) "repeater", (new ItemReed(Blocks.unpowered_repeater)).setUnlocalizedName("diode") .setCreativeTab(CreativeTabs.tabRedstone)); @@ -701,8 +707,8 @@ public class Item { (new ItemCarrotOnAStick()).setUnlocalizedName("carrotOnAStick")); registerItem(399, (String) "nether_star", (new ItemSimpleFoiled()).setUnlocalizedName("netherStar").setCreativeTab(CreativeTabs.tabMaterials)); - registerItem(400, (String) "pumpkin_pie", - (new ItemFood(8, 0.3F, false)).setUnlocalizedName("pumpkinPie").setCreativeTab(CreativeTabs.tabFood)); + registerItem(400, (String) "pumpkin_pie", (new ItemFood(8, 0.3F, false)).setUnlocalizedName("pumpkinPie") + .setCreativeTab(CreativeTabs.tabBrewing)); registerItem(401, (String) "fireworks", (new ItemFirework()).setUnlocalizedName("fireworks")); registerItem(402, (String) "firework_charge", (new ItemFireworkCharge()).setUnlocalizedName("fireworksCharge").setCreativeTab(CreativeTabs.tabMisc)); @@ -764,58 +770,7 @@ public class Item { registerItem(2266, (String) "record_11", (new ItemRecord("11")).setUnlocalizedName("record")); registerItem(2267, (String) "record_wait", (new ItemRecord("wait")).setUnlocalizedName("record")); - registerItemBlock(Blocks.deepstone); - registerItemBlock(Blocks.cobbled_deepstone); - registerItemBlock(Blocks.steel_block); - registerItemBlock(Blocks.steel_grate); - registerItemBlock(Blocks.platinum_ore); - registerItemBlock(Blocks.platinum_block); - registerItemBlock(Blocks.titanium_ore); - registerItemBlock(Blocks.titanium_block); - registerItemBlock(Blocks.uranium_ore); - registerItemBlock(Blocks.uranium_block); - registerItemBlock(Blocks.mosaic, - (new ItemMultiTexture(Blocks.mosaic, Blocks.mosaic, new Function() { - public String apply(ItemStack itemstack) { - return BlockMosaic.EnumType.byMetadata(itemstack.getMetadata()).getUnlocalizedName(); - } - })).setUnlocalizedName("mosaic")); - registerItemBlock(Blocks.fabricator); - - registerItem(1024, (String) "starlike:steel", - (new Item()).setUnlocalizedName("steel").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1025, (String) "starlike:platinum_ingot", - (new Item()).setUnlocalizedName("platinum_ingot").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1026, (String) "starlike:platinum_sword", (new ItemSword(Item.ToolMaterial.PLATINUM)) - .setUnlocalizedName("platinum_sword").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1027, (String) "starlike:platinum_pickaxe", (new ItemPickaxe(Item.ToolMaterial.PLATINUM)) - .setUnlocalizedName("platinum_pickaxe").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1028, (String) "starlike:platinum_shovel", (new ItemSpade(Item.ToolMaterial.PLATINUM)) - .setUnlocalizedName("platinum_shovel").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1029, (String) "starlike:platinum_axe", (new ItemAxe(Item.ToolMaterial.PLATINUM)) - .setUnlocalizedName("platinum_axe").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1030, (String) "starlike:platinum_hoe", (new ItemHoe(Item.ToolMaterial.PLATINUM)) - .setUnlocalizedName("platinum_hoe").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1031, (String) "starlike:platinum_helmet", (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 0)) - .setUnlocalizedName("platinum_helmet").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1032, (String) "starlike:platinum_chestplate", - (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 1)).setUnlocalizedName("platinum_chestplate") - .setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1033, (String) "starlike:platinum_leggings", - (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 2)).setUnlocalizedName("platinum_leggings") - .setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1034, (String) "starlike:platinum_boots", (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 3)) - .setUnlocalizedName("platinum_boots").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1035, (String) "starlike:titanium_ingot", - (new Item()).setUnlocalizedName("titanium_ingot").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1036, (String) "starlike:uranium_crystal", - (new Item()).setUnlocalizedName("uranium_crystal").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1037, (String) "starlike:uranium_rod", - (new Item()).setUnlocalizedName("uranium_rod").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1038, (String) "starlike:platinum_drill", (new ItemPickaxe(Item.ToolMaterial.PLATINUM_DRILL)) - .setUnlocalizedName("platinum_drill").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1039, (String) "starlike:titanium_drill", (new ItemPickaxe(Item.ToolMaterial.TITANIUM_DRILL)) - .setUnlocalizedName("titanium_drill").setCreativeTab(CreativeTabs.tabStarlike)); + ItemsStarlike.registerItems(); } private CreativeTabs tabToDisplayOn; @@ -1206,4 +1161,4 @@ public class Item { public boolean updateItemStackNBT(NBTTagCompound var1) { return false; } -} \ No newline at end of file +} diff --git a/src/game/java/net/minecraft/item/ItemArmor.java b/src/game/java/net/minecraft/item/ItemArmor.java index 68cce969..3919b383 100644 --- a/src/game/java/net/minecraft/item/ItemArmor.java +++ b/src/game/java/net/minecraft/item/ItemArmor.java @@ -46,7 +46,8 @@ public class ItemArmor extends Item { public static enum ArmorMaterial { LEATHER("leather", 5, new int[] { 1, 3, 2, 1 }, 15), CHAIN("chainmail", 15, new int[] { 2, 5, 4, 1 }, 12), IRON("iron", 15, new int[] { 2, 6, 5, 2 }, 9), GOLD("gold", 7, new int[] { 2, 5, 3, 1 }, 25), - DIAMOND("diamond", 33, new int[] { 3, 8, 6, 3 }, 10), PLATINUM("platinum", 41, new int[] { 4, 10, 7, 3 }, 12); + DIAMOND("diamond", 33, new int[] { 3, 8, 6, 3 }, 10), NETHERITE("netherite", 37, new int[] { 3, 8, 6, 3 }, 15), + PLATINUM("platinum", 41, new int[] { 4, 10, 7, 3 }, 12); private final String name; private final int maxDamageFactor; @@ -82,7 +83,8 @@ public class ItemArmor extends Item { : (this == GOLD ? Items.gold_ingot : (this == IRON ? Items.iron_ingot : (this == DIAMOND ? Items.diamond - : (this == PLATINUM ? Items.platinum_ingot : null))))); + : (this == NETHERITE ? Items.netherite_ingot + : (this == PLATINUM ? Items.platinum_ingot : null)))))); } } diff --git a/src/game/java/net/minecraft/item/ItemAxe.java b/src/game/java/net/minecraft/item/ItemAxe.java index 2d49b19b..0f6413f5 100644 --- a/src/game/java/net/minecraft/item/ItemAxe.java +++ b/src/game/java/net/minecraft/item/ItemAxe.java @@ -39,7 +39,7 @@ public class ItemAxe extends ItemTool { Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder }); } - protected ItemAxe(Item.ToolMaterial material) { + public ItemAxe(Item.ToolMaterial material) { super(3.0F, material, EFFECTIVE_ON); } diff --git a/src/game/java/net/minecraft/item/ItemFood.java b/src/game/java/net/minecraft/item/ItemFood.java index 193d08c2..e49d4d53 100644 --- a/src/game/java/net/minecraft/item/ItemFood.java +++ b/src/game/java/net/minecraft/item/ItemFood.java @@ -49,7 +49,7 @@ public class ItemFood extends Item { this.healAmount = amount; this.isWolfsFavoriteMeat = isWolfFood; this.saturationModifier = saturation; - this.setCreativeTab(CreativeTabs.tabFood); + this.setCreativeTab(CreativeTabs.tabBrewing); } public int getHealAmount(ItemStack var1) { diff --git a/src/game/java/net/minecraft/item/ItemPickaxe.java b/src/game/java/net/minecraft/item/ItemPickaxe.java index b5c46ec6..57a33e96 100644 --- a/src/game/java/net/minecraft/item/ItemPickaxe.java +++ b/src/game/java/net/minecraft/item/ItemPickaxe.java @@ -43,11 +43,11 @@ public class ItemPickaxe extends ItemTool { Blocks.red_sandstone, Blocks.stone, Blocks.stone_slab, Blocks.titanium_ore, Blocks.titanium_block, Blocks.uranium_ore, Blocks.uranium_block, - Blocks.platinum_ore, Blocks.platinum_block, Blocks.steel_block, Blocks.steel_grate, Blocks.deepstone, - Blocks.cobbled_deepstone }); + Blocks.platinum_ore, Blocks.platinum_block, Blocks.steel_block, Blocks.steel_grate, Blocks.deepslate, + Blocks.cobbled_deepslate }); } - protected ItemPickaxe(Item.ToolMaterial material) { + public ItemPickaxe(Item.ToolMaterial material) { super(2.0F, material, EFFECTIVE_ON); } @@ -57,8 +57,10 @@ public class ItemPickaxe extends ItemTool { public boolean canHarvestBlock(Block blockIn) { if (blockIn == Blocks.titanium_block || blockIn == Blocks.titanium_ore || blockIn == Blocks.uranium_block || blockIn == Blocks.uranium_ore) { + return this.toolMaterial.getHarvestLevel() >= 5; + } else if (blockIn == Blocks.platinum_block || blockIn == Blocks.platinum_ore) { return this.toolMaterial.getHarvestLevel() >= 4; - } else if (blockIn == Blocks.platinum_block || blockIn == Blocks.platinum_ore || blockIn == Blocks.obsidian) { + } else if (blockIn == Blocks.obsidian) { return this.toolMaterial.getHarvestLevel() >= 3; } else if (blockIn == Blocks.diamond_block || blockIn == Blocks.diamond_ore || blockIn == Blocks.emerald_block || blockIn == Blocks.emerald_ore || blockIn == Blocks.gold_block || blockIn == Blocks.gold_ore diff --git a/src/game/java/net/minecraft/item/crafting/CraftingManager.java b/src/game/java/net/minecraft/item/crafting/CraftingManager.java index 65815148..3fa3373f 100644 --- a/src/game/java/net/minecraft/item/crafting/CraftingManager.java +++ b/src/game/java/net/minecraft/item/crafting/CraftingManager.java @@ -10,15 +10,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.minecraft.block.Block; -import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockPrismarine; -import net.minecraft.block.BlockQuartz; -import net.minecraft.block.BlockRedSandstone; -import net.minecraft.block.BlockSand; -import net.minecraft.block.BlockSandStone; import net.minecraft.block.BlockStone; -import net.minecraft.block.BlockStoneBrick; import net.minecraft.block.BlockStoneSlab; import net.minecraft.block.BlockStoneSlabNew; import net.minecraft.block.BlockWall; @@ -29,6 +22,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.starlikeclient.minecraft.init.RecipesStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -86,87 +80,6 @@ public class CraftingManager { this.recipes.add(new RecipeFireworks()); this.recipes.add(new RecipeRepairItem()); (new RecipesBanners()).addRecipes(this); - this.addRecipe(new ItemStack(Blocks.chest), - new Object[] { "###", "# #", "###", Character.valueOf('#'), Blocks.planks }); - this.addRecipe(new ItemStack(Blocks.trapped_chest), new Object[] { "#-", Character.valueOf('#'), Blocks.chest, - Character.valueOf('-'), Blocks.tripwire_hook }); - this.addRecipe(new ItemStack(Blocks.ender_chest), new Object[] { "###", "#E#", "###", Character.valueOf('#'), - Blocks.obsidian, Character.valueOf('E'), Items.ender_eye }); - this.addRecipe(new ItemStack(Blocks.furnace), - new Object[] { "###", "# #", "###", Character.valueOf('#'), Blocks.cobblestone }); - this.addRecipe(new ItemStack(Blocks.crafting_table), - new Object[] { "##", "##", Character.valueOf('#'), Blocks.planks }); - this.addRecipe(new ItemStack(Blocks.sandstone), new Object[] { "##", "##", Character.valueOf('#'), - new ItemStack(Blocks.sand, 1, BlockSand.EnumType.SAND.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.red_sandstone), new Object[] { "##", "##", Character.valueOf('#'), - new ItemStack(Blocks.sand, 1, BlockSand.EnumType.RED_SAND.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.sandstone, 4, BlockSandStone.EnumType.SMOOTH.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), - new ItemStack(Blocks.sandstone, 1, BlockSandStone.EnumType.DEFAULT.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.red_sandstone, 4, BlockRedSandstone.EnumType.SMOOTH.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), - new ItemStack(Blocks.red_sandstone, 1, BlockRedSandstone.EnumType.DEFAULT.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.sandstone, 1, BlockSandStone.EnumType.CHISELED.getMetadata()), - new Object[] { "#", "#", Character.valueOf('#'), - new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.SAND.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.red_sandstone, 1, BlockRedSandstone.EnumType.CHISELED.getMetadata()), - new Object[] { "#", "#", Character.valueOf('#'), - new ItemStack(Blocks.stone_slab2, 1, BlockStoneSlabNew.EnumType.RED_SANDSTONE.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.quartz_block, 1, BlockQuartz.EnumType.CHISELED.getMetadata()), - new Object[] { "#", "#", Character.valueOf('#'), - new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.QUARTZ.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.quartz_block, 2, BlockQuartz.EnumType.LINES_Y.getMetadata()), - new Object[] { "#", "#", Character.valueOf('#'), - new ItemStack(Blocks.quartz_block, 1, BlockQuartz.EnumType.DEFAULT.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.stonebrick, 4), new Object[] { "##", "##", Character.valueOf('#'), - new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.CHISELED_META), - new Object[] { "#", "#", Character.valueOf('#'), - new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.SMOOTHBRICK.getMetadata()) }); - this.addShapelessRecipe(new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.MOSSY_META), - new Object[] { Blocks.stonebrick, Blocks.vine }); - this.addShapelessRecipe(new ItemStack(Blocks.mossy_cobblestone, 1), - new Object[] { Blocks.cobblestone, Blocks.vine }); - this.addRecipe(new ItemStack(Blocks.iron_bars, 16), - new Object[] { "###", "###", Character.valueOf('#'), Items.iron_ingot }); - this.addRecipe(new ItemStack(Blocks.glass_pane, 16), - new Object[] { "###", "###", Character.valueOf('#'), Blocks.glass }); - this.addRecipe(new ItemStack(Blocks.redstone_lamp, 1), new Object[] { " R ", "RGR", " R ", - Character.valueOf('R'), Items.redstone, Character.valueOf('G'), Blocks.glowstone }); - this.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { "GGG", "GSG", "OOO", Character.valueOf('G'), - Blocks.glass, Character.valueOf('S'), Items.nether_star, Character.valueOf('O'), Blocks.obsidian }); - this.addRecipe(new ItemStack(Blocks.nether_brick, 1), - new Object[] { "NN", "NN", Character.valueOf('N'), Items.netherbrick }); - this.addRecipe(new ItemStack(Blocks.stone, 2, BlockStone.EnumType.DIORITE.getMetadata()), new Object[] { "CQ", - "QC", Character.valueOf('C'), Blocks.cobblestone, Character.valueOf('Q'), Items.quartz }); - this.addShapelessRecipe(new ItemStack(Blocks.stone, 1, BlockStone.EnumType.GRANITE.getMetadata()), - new Object[] { new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetadata()), - Items.quartz }); - this.addShapelessRecipe(new ItemStack(Blocks.stone, 2, BlockStone.EnumType.ANDESITE.getMetadata()), - new Object[] { new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetadata()), - Blocks.cobblestone }); - this.addRecipe(new ItemStack(Blocks.dirt, 4, BlockDirt.DirtType.COARSE_DIRT.getMetadata()), - new Object[] { "DG", "GD", Character.valueOf('D'), - new ItemStack(Blocks.dirt, 1, BlockDirt.DirtType.DIRT.getMetadata()), Character.valueOf('G'), - Blocks.gravel }); - this.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.DIORITE_SMOOTH.getMetadata()), - new Object[] { "SS", "SS", Character.valueOf('S'), - new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.GRANITE_SMOOTH.getMetadata()), - new Object[] { "SS", "SS", Character.valueOf('S'), - new ItemStack(Blocks.stone, 1, BlockStone.EnumType.GRANITE.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.ANDESITE_SMOOTH.getMetadata()), - new Object[] { "SS", "SS", Character.valueOf('S'), - new ItemStack(Blocks.stone, 1, BlockStone.EnumType.ANDESITE.getMetadata()) }); - this.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.ROUGH_META), - new Object[] { "SS", "SS", Character.valueOf('S'), Items.prismarine_shard }); - this.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.BRICKS_META), - new Object[] { "SSS", "SSS", "SSS", Character.valueOf('S'), Items.prismarine_shard }); - this.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.DARK_META), - new Object[] { "SSS", "SIS", "SSS", Character.valueOf('S'), Items.prismarine_shard, - Character.valueOf('I'), new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeDamage()) }); - this.addRecipe(new ItemStack(Blocks.sea_lantern, 1, 0), new Object[] { "SCS", "CCC", "SCS", - Character.valueOf('S'), Items.prismarine_shard, Character.valueOf('C'), Items.prismarine_crystals }); this.addRecipe(new ItemStack(Items.paper, 3), new Object[] { "###", Character.valueOf('#'), Items.reeds }); this.addShapelessRecipe(new ItemStack(Items.book, 1), new Object[] { Items.paper, Items.paper, Items.paper, Items.leather }); @@ -464,6 +377,9 @@ public class CraftingManager { this.addRecipe(new ItemStack(Items.armor_stand, 1), new Object[] { "///", " / ", "/_/", Character.valueOf('/'), Items.stick, Character.valueOf('_'), new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.STONE.getMetadata()) }); + + RecipesStarlike.addCraftingRecipes(this); + Collections.sort(this.recipes, new Comparator() { public int compare(IRecipe parIRecipe, IRecipe parIRecipe2) { return parIRecipe instanceof ShapelessRecipes && parIRecipe2 instanceof ShapedRecipes ? 1 diff --git a/src/game/java/net/minecraft/item/crafting/FurnaceRecipes.java b/src/game/java/net/minecraft/item/crafting/FurnaceRecipes.java index 07127d6a..07450930 100644 --- a/src/game/java/net/minecraft/item/crafting/FurnaceRecipes.java +++ b/src/game/java/net/minecraft/item/crafting/FurnaceRecipes.java @@ -13,6 +13,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemFishFood; import net.minecraft.item.ItemStack; +import net.starlikeclient.minecraft.init.RecipesStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -87,16 +88,7 @@ public class FurnaceRecipes { } } - this.addSmeltingRecipeForBlock(Blocks.coal_ore, new ItemStack(Items.coal), 0.1F); - this.addSmeltingRecipeForBlock(Blocks.redstone_ore, new ItemStack(Items.redstone), 0.7F); - this.addSmeltingRecipeForBlock(Blocks.lapis_ore, new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeDamage()), - 0.2F); - this.addSmeltingRecipeForBlock(Blocks.quartz_ore, new ItemStack(Items.quartz), 0.2F); - - this.addSmeltingRecipeForBlock(Blocks.cobbled_deepstone, new ItemStack(Blocks.deepstone), 0.1F); - this.addSmeltingRecipeForBlock(Blocks.platinum_ore, new ItemStack(Items.platinum_ingot), 1.5F); - this.addSmeltingRecipeForBlock(Blocks.titanium_ore, new ItemStack(Items.titanium_ingot), 2.0F); - this.addSmeltingRecipeForBlock(Blocks.uranium_ore, new ItemStack(Items.uranium_crystal), 0.2F); + RecipesStarlike.addFurnaceRecipes(this); } /** diff --git a/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java b/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java index e5e47d47..5ff0c95e 100644 --- a/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java +++ b/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java @@ -1,9 +1,18 @@ package net.minecraft.item.crafting; -import net.minecraft.block.BlockMosaic; -import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.BlockPrismarine; +import net.minecraft.block.BlockQuartz; +import net.minecraft.block.BlockRedSandstone; +import net.minecraft.block.BlockSand; +import net.minecraft.block.BlockSandStone; +import net.minecraft.block.BlockStone; +import net.minecraft.block.BlockStoneBrick; +import net.minecraft.block.BlockStoneSlab; +import net.minecraft.block.BlockStoneSlabNew; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; /** @@ -34,56 +43,91 @@ public class RecipesCrafting { * + Adds the crafting recipes to the CraftingManager. */ public void addRecipes(CraftingManager parCraftingManager) { - parCraftingManager.addRecipe(new ItemStack(Items.steel, 1), new Object[] { "III", "ICI", "III", - Character.valueOf('I'), Items.iron_ingot, Character.valueOf('C'), Items.coal }); - parCraftingManager.addRecipe(new ItemStack(Blocks.steel_grate, 4), - new Object[] { "S S", " S ", "S S", Character.valueOf('S'), Items.steel }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_sword, 1), new Object[] { "P", "P", "B", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_pickaxe, 1), new Object[] { "PPP", " B ", " B ", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_shovel, 1), new Object[] { "P", "B", "B", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_axe, 1), new Object[] { "PP ", "PB ", " B ", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_axe, 1), new Object[] { " PP", " BP", " B ", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_hoe, 1), new Object[] { "PP ", " B ", " B ", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_hoe, 1), new Object[] { " PP", " B ", " B ", - Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_helmet, 1), - new Object[] { "PPP", "P P", Character.valueOf('P'), Items.platinum_ingot }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_chestplate, 1), - new Object[] { "P P", "PPP", "PPP", Character.valueOf('P'), Items.platinum_ingot }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_leggings, 1), - new Object[] { "PPP", "P P", "P P", Character.valueOf('P'), Items.platinum_ingot }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_boots, 1), - new Object[] { "P P", "P P", Character.valueOf('P'), Items.platinum_ingot }); - parCraftingManager.addRecipe(new ItemStack(Items.uranium_rod, 1), - new Object[] { "U", "U", "U", Character.valueOf('U'), Items.uranium_crystal, }); - parCraftingManager.addRecipe(new ItemStack(Items.platinum_drill, 1), - new Object[] { " PP", "SUP", "SS ", Character.valueOf('P'), Items.platinum_ingot, - Character.valueOf('S'), Items.steel, Character.valueOf('U'), Items.uranium_rod }); - parCraftingManager.addRecipe(new ItemStack(Items.titanium_drill, 1), new Object[] { "TTT", "TDT", "TTT", - Character.valueOf('T'), Items.titanium_ingot, Character.valueOf('D'), Items.platinum_drill }); - parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.OAK.getMetadata()), - new Object[] { "# #", " ", "# #", Character.valueOf('#'), - new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.getMetadata()) }); - parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.SPRUCE.getMetadata()), - new Object[] { "# #", " ", "# #", Character.valueOf('#'), - new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.getMetadata()) }); - parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.BIRCH.getMetadata()), - new Object[] { "# #", " ", "# #", Character.valueOf('#'), - new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.getMetadata()) }); - parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.JUNGLE.getMetadata()), - new Object[] { "# #", " ", "# #", Character.valueOf('#'), - new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.getMetadata()) }); - parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.ACACIA.getMetadata()), - new Object[] { "# #", " ", "# #", Character.valueOf('#'), - new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.ACACIA.getMetadata()) }); - parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.DARK_OAK.getMetadata()), - new Object[] { "# #", " ", "# #", Character.valueOf('#'), - new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.DARK_OAK.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.chest), + new Object[] { "###", "# #", "###", Character.valueOf('#'), Blocks.planks }); + parCraftingManager.addRecipe(new ItemStack(Blocks.trapped_chest), new Object[] { "#-", Character.valueOf('#'), + Blocks.chest, Character.valueOf('-'), Blocks.tripwire_hook }); + parCraftingManager.addRecipe(new ItemStack(Blocks.ender_chest), new Object[] { "###", "#E#", "###", + Character.valueOf('#'), Blocks.obsidian, Character.valueOf('E'), Items.ender_eye }); + parCraftingManager.addRecipe(new ItemStack(Blocks.furnace), + new Object[] { "###", "# #", "###", Character.valueOf('#'), Blocks.cobblestone }); + parCraftingManager.addRecipe(new ItemStack(Blocks.crafting_table), + new Object[] { "##", "##", Character.valueOf('#'), Blocks.planks }); + parCraftingManager.addRecipe(new ItemStack(Blocks.sandstone), new Object[] { "##", "##", Character.valueOf('#'), + new ItemStack(Blocks.sand, 1, BlockSand.EnumType.SAND.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.red_sandstone), new Object[] { "##", "##", + Character.valueOf('#'), new ItemStack(Blocks.sand, 1, BlockSand.EnumType.RED_SAND.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.sandstone, 4, BlockSandStone.EnumType.SMOOTH.getMetadata()), + new Object[] { "##", "##", Character.valueOf('#'), + new ItemStack(Blocks.sandstone, 1, BlockSandStone.EnumType.DEFAULT.getMetadata()) }); + parCraftingManager.addRecipe( + new ItemStack(Blocks.red_sandstone, 4, BlockRedSandstone.EnumType.SMOOTH.getMetadata()), + new Object[] { "##", "##", Character.valueOf('#'), + new ItemStack(Blocks.red_sandstone, 1, BlockRedSandstone.EnumType.DEFAULT.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.sandstone, 1, BlockSandStone.EnumType.CHISELED.getMetadata()), + new Object[] { "#", "#", Character.valueOf('#'), + new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.SAND.getMetadata()) }); + parCraftingManager.addRecipe( + new ItemStack(Blocks.red_sandstone, 1, BlockRedSandstone.EnumType.CHISELED.getMetadata()), + new Object[] { "#", "#", Character.valueOf('#'), + new ItemStack(Blocks.stone_slab2, 1, BlockStoneSlabNew.EnumType.RED_SANDSTONE.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.quartz_block, 1, BlockQuartz.EnumType.CHISELED.getMetadata()), + new Object[] { "#", "#", Character.valueOf('#'), + new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.QUARTZ.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.quartz_block, 2, BlockQuartz.EnumType.LINES_Y.getMetadata()), + new Object[] { "#", "#", Character.valueOf('#'), + new ItemStack(Blocks.quartz_block, 1, BlockQuartz.EnumType.DEFAULT.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.stonebrick, 4), new Object[] { "##", "##", + Character.valueOf('#'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.CHISELED_META), + new Object[] { "#", "#", Character.valueOf('#'), + new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.SMOOTHBRICK.getMetadata()) }); + parCraftingManager.addShapelessRecipe(new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.MOSSY_META), + new Object[] { Blocks.stonebrick, Blocks.vine }); + parCraftingManager.addShapelessRecipe(new ItemStack(Blocks.mossy_cobblestone, 1), + new Object[] { Blocks.cobblestone, Blocks.vine }); + parCraftingManager.addRecipe(new ItemStack(Blocks.iron_bars, 16), + new Object[] { "###", "###", Character.valueOf('#'), Items.iron_ingot }); + parCraftingManager.addRecipe(new ItemStack(Blocks.glass_pane, 16), + new Object[] { "###", "###", Character.valueOf('#'), Blocks.glass }); + parCraftingManager.addRecipe(new ItemStack(Blocks.redstone_lamp, 1), new Object[] { " R ", "RGR", " R ", + Character.valueOf('R'), Items.redstone, Character.valueOf('G'), Blocks.glowstone }); + parCraftingManager.addRecipe(new ItemStack(Blocks.beacon, 1), + new Object[] { "GGG", "GSG", "OOO", Character.valueOf('G'), Blocks.glass, Character.valueOf('S'), + Items.nether_star, Character.valueOf('O'), Blocks.obsidian }); + parCraftingManager.addRecipe(new ItemStack(Blocks.nether_brick, 1), + new Object[] { "NN", "NN", Character.valueOf('N'), Items.netherbrick }); + parCraftingManager.addRecipe(new ItemStack(Blocks.stone, 2, BlockStone.EnumType.DIORITE.getMetadata()), + new Object[] { "CQ", "QC", Character.valueOf('C'), Blocks.cobblestone, Character.valueOf('Q'), + Items.quartz }); + parCraftingManager.addShapelessRecipe(new ItemStack(Blocks.stone, 1, BlockStone.EnumType.GRANITE.getMetadata()), + new Object[] { new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetadata()), + Items.quartz }); + parCraftingManager.addShapelessRecipe( + new ItemStack(Blocks.stone, 2, BlockStone.EnumType.ANDESITE.getMetadata()), + new Object[] { new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetadata()), + Blocks.cobblestone }); + parCraftingManager.addRecipe(new ItemStack(Blocks.dirt, 4, BlockDirt.DirtType.COARSE_DIRT.getMetadata()), + new Object[] { "DG", "GD", Character.valueOf('D'), + new ItemStack(Blocks.dirt, 1, BlockDirt.DirtType.DIRT.getMetadata()), Character.valueOf('G'), + Blocks.gravel }); + parCraftingManager.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.DIORITE_SMOOTH.getMetadata()), + new Object[] { "SS", "SS", Character.valueOf('S'), + new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.GRANITE_SMOOTH.getMetadata()), + new Object[] { "SS", "SS", Character.valueOf('S'), + new ItemStack(Blocks.stone, 1, BlockStone.EnumType.GRANITE.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.ANDESITE_SMOOTH.getMetadata()), + new Object[] { "SS", "SS", Character.valueOf('S'), + new ItemStack(Blocks.stone, 1, BlockStone.EnumType.ANDESITE.getMetadata()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.ROUGH_META), + new Object[] { "SS", "SS", Character.valueOf('S'), Items.prismarine_shard }); + parCraftingManager.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.BRICKS_META), + new Object[] { "SSS", "SSS", "SSS", Character.valueOf('S'), Items.prismarine_shard }); + parCraftingManager.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.DARK_META), + new Object[] { "SSS", "SIS", "SSS", Character.valueOf('S'), Items.prismarine_shard, + Character.valueOf('I'), new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeDamage()) }); + parCraftingManager.addRecipe(new ItemStack(Blocks.sea_lantern, 1, 0), new Object[] { "SCS", "CCC", "SCS", + Character.valueOf('S'), Items.prismarine_shard, Character.valueOf('C'), Items.prismarine_crystals }); } -} \ No newline at end of file +} diff --git a/src/game/java/net/minecraft/item/crafting/RecipesIngots.java b/src/game/java/net/minecraft/item/crafting/RecipesIngots.java index 98349b4c..69f1ecef 100644 --- a/src/game/java/net/minecraft/item/crafting/RecipesIngots.java +++ b/src/game/java/net/minecraft/item/crafting/RecipesIngots.java @@ -44,11 +44,7 @@ public class RecipesIngots { { Blocks.redstone_block, new ItemStack(Items.redstone, 9) }, { Blocks.coal_block, new ItemStack(Items.coal, 9, 0) }, { Blocks.hay_block, new ItemStack(Items.wheat, 9) }, - { Blocks.slime_block, new ItemStack(Items.slime_ball, 9) }, - { Blocks.platinum_block, new ItemStack(Items.platinum_ingot, 9) }, - { Blocks.titanium_block, new ItemStack(Items.titanium_ingot, 9) }, - { Blocks.uranium_block, new ItemStack(Items.uranium_crystal, 9) }, - { Blocks.steel_block, new ItemStack(Items.steel, 9) } }; + { Blocks.slime_block, new ItemStack(Items.slime_ball, 9) } }; for (int i = 0; i < this.recipeItems.length; ++i) { Block block = (Block) this.recipeItems[i][0]; ItemStack itemstack = (ItemStack) this.recipeItems[i][1]; diff --git a/src/game/java/net/minecraft/network/EnumConnectionState.java b/src/game/java/net/minecraft/network/EnumConnectionState.java index 3e6ef177..2150e8d9 100644 --- a/src/game/java/net/minecraft/network/EnumConnectionState.java +++ b/src/game/java/net/minecraft/network/EnumConnectionState.java @@ -2,6 +2,7 @@ package net.minecraft.network; import java.util.Collection; import java.util.Map; +import java.util.function.Supplier; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -136,121 +137,179 @@ import net.minecraft.network.play.server.S49PacketUpdateEntityNBT; public enum EnumConnectionState { HANDSHAKING(-1) { { - this.registerPacket(EnumPacketDirection.SERVERBOUND, C00Handshake.class); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C00Handshake.class, C00Handshake::new); } }, PLAY(0) { { - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S00PacketKeepAlive.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S01PacketJoinGame.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S02PacketChat.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S03PacketTimeUpdate.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S04PacketEntityEquipment.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S05PacketSpawnPosition.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S06PacketUpdateHealth.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S07PacketRespawn.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S08PacketPlayerPosLook.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S09PacketHeldItemChange.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0APacketUseBed.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0BPacketAnimation.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0CPacketSpawnPlayer.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0DPacketCollectItem.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0EPacketSpawnObject.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0FPacketSpawnMob.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S10PacketSpawnPainting.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S11PacketSpawnExperienceOrb.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S12PacketEntityVelocity.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S13PacketDestroyEntities.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.S15PacketEntityRelMove.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.S16PacketEntityLook.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.S17PacketEntityLookMove.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S18PacketEntityTeleport.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S19PacketEntityHeadLook.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S19PacketEntityStatus.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1BPacketEntityAttach.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1CPacketEntityMetadata.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1DPacketEntityEffect.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1EPacketRemoveEntityEffect.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1FPacketSetExperience.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S20PacketEntityProperties.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S21PacketChunkData.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S22PacketMultiBlockChange.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S23PacketBlockChange.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S24PacketBlockAction.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S25PacketBlockBreakAnim.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S26PacketMapChunkBulk.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S27PacketExplosion.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S28PacketEffect.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S29PacketSoundEffect.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2APacketParticles.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2BPacketChangeGameState.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2CPacketSpawnGlobalEntity.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2DPacketOpenWindow.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2EPacketCloseWindow.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2FPacketSetSlot.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S30PacketWindowItems.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S31PacketWindowProperty.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S32PacketConfirmTransaction.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S33PacketUpdateSign.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S34PacketMaps.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S35PacketUpdateTileEntity.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S36PacketSignEditorOpen.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S37PacketStatistics.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S38PacketPlayerListItem.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S39PacketPlayerAbilities.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3APacketTabComplete.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3BPacketScoreboardObjective.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3CPacketUpdateScore.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3DPacketDisplayScoreboard.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3EPacketTeams.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3FPacketCustomPayload.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S40PacketDisconnect.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S41PacketServerDifficulty.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S42PacketCombatEvent.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S43PacketCamera.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S44PacketWorldBorder.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S45PacketTitle.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S46PacketSetCompressionLevel.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S47PacketPlayerListHeaderFooter.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S48PacketResourcePackSend.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S49PacketUpdateEntityNBT.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C00PacketKeepAlive.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C01PacketChatMessage.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C02PacketUseEntity.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.C04PacketPlayerPosition.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.C05PacketPlayerLook.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.C06PacketPlayerPosLook.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C07PacketPlayerDigging.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C08PacketPlayerBlockPlacement.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C09PacketHeldItemChange.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C0APacketAnimation.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C0BPacketEntityAction.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C0CPacketInput.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C0DPacketCloseWindow.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C0EPacketClickWindow.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C0FPacketConfirmTransaction.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C10PacketCreativeInventoryAction.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C11PacketEnchantItem.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C12PacketUpdateSign.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C13PacketPlayerAbilities.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C14PacketTabComplete.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C15PacketClientSettings.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C16PacketClientStatus.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C17PacketCustomPayload.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C18PacketSpectate.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C19PacketResourcePackStatus.class); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S00PacketKeepAlive.class, S00PacketKeepAlive::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S01PacketJoinGame.class, S01PacketJoinGame::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S02PacketChat.class, S02PacketChat::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S03PacketTimeUpdate.class, S03PacketTimeUpdate::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S04PacketEntityEquipment.class, + S04PacketEntityEquipment::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S05PacketSpawnPosition.class, + S05PacketSpawnPosition::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S06PacketUpdateHealth.class, + S06PacketUpdateHealth::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S07PacketRespawn.class, S07PacketRespawn::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S08PacketPlayerPosLook.class, + S08PacketPlayerPosLook::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S09PacketHeldItemChange.class, + S09PacketHeldItemChange::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0APacketUseBed.class, S0APacketUseBed::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0BPacketAnimation.class, S0BPacketAnimation::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0CPacketSpawnPlayer.class, S0CPacketSpawnPlayer::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0DPacketCollectItem.class, S0DPacketCollectItem::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0EPacketSpawnObject.class, S0EPacketSpawnObject::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S0FPacketSpawnMob.class, S0FPacketSpawnMob::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S10PacketSpawnPainting.class, + S10PacketSpawnPainting::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S11PacketSpawnExperienceOrb.class, + S11PacketSpawnExperienceOrb::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S12PacketEntityVelocity.class, + S12PacketEntityVelocity::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S13PacketDestroyEntities.class, + S13PacketDestroyEntities::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.class, S14PacketEntity::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.S15PacketEntityRelMove.class, + S14PacketEntity.S15PacketEntityRelMove::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.S16PacketEntityLook.class, + S14PacketEntity.S16PacketEntityLook::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S14PacketEntity.S17PacketEntityLookMove.class, + S14PacketEntity.S17PacketEntityLookMove::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S18PacketEntityTeleport.class, + S18PacketEntityTeleport::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S19PacketEntityHeadLook.class, + S19PacketEntityHeadLook::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S19PacketEntityStatus.class, + S19PacketEntityStatus::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1BPacketEntityAttach.class, + S1BPacketEntityAttach::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1CPacketEntityMetadata.class, + S1CPacketEntityMetadata::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1DPacketEntityEffect.class, + S1DPacketEntityEffect::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1EPacketRemoveEntityEffect.class, + S1EPacketRemoveEntityEffect::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S1FPacketSetExperience.class, + S1FPacketSetExperience::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S20PacketEntityProperties.class, + S20PacketEntityProperties::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S21PacketChunkData.class, S21PacketChunkData::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S22PacketMultiBlockChange.class, + S22PacketMultiBlockChange::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S23PacketBlockChange.class, S23PacketBlockChange::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S24PacketBlockAction.class, S24PacketBlockAction::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S25PacketBlockBreakAnim.class, + S25PacketBlockBreakAnim::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S26PacketMapChunkBulk.class, + S26PacketMapChunkBulk::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S27PacketExplosion.class, S27PacketExplosion::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S28PacketEffect.class, S28PacketEffect::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S29PacketSoundEffect.class, S29PacketSoundEffect::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2APacketParticles.class, S2APacketParticles::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2BPacketChangeGameState.class, + S2BPacketChangeGameState::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2CPacketSpawnGlobalEntity.class, + S2CPacketSpawnGlobalEntity::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2DPacketOpenWindow.class, S2DPacketOpenWindow::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2EPacketCloseWindow.class, S2EPacketCloseWindow::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S2FPacketSetSlot.class, S2FPacketSetSlot::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S30PacketWindowItems.class, S30PacketWindowItems::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S31PacketWindowProperty.class, + S31PacketWindowProperty::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S32PacketConfirmTransaction.class, + S32PacketConfirmTransaction::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S33PacketUpdateSign.class, S33PacketUpdateSign::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S34PacketMaps.class, S34PacketMaps::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S35PacketUpdateTileEntity.class, + S35PacketUpdateTileEntity::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S36PacketSignEditorOpen.class, + S36PacketSignEditorOpen::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S37PacketStatistics.class, S37PacketStatistics::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S38PacketPlayerListItem.class, + S38PacketPlayerListItem::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S39PacketPlayerAbilities.class, + S39PacketPlayerAbilities::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3APacketTabComplete.class, S3APacketTabComplete::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3BPacketScoreboardObjective.class, + S3BPacketScoreboardObjective::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3CPacketUpdateScore.class, S3CPacketUpdateScore::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3DPacketDisplayScoreboard.class, + S3DPacketDisplayScoreboard::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3EPacketTeams.class, S3EPacketTeams::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S3FPacketCustomPayload.class, + S3FPacketCustomPayload::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S40PacketDisconnect.class, S40PacketDisconnect::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S41PacketServerDifficulty.class, + S41PacketServerDifficulty::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S42PacketCombatEvent.class, S42PacketCombatEvent::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S43PacketCamera.class, S43PacketCamera::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S44PacketWorldBorder.class, S44PacketWorldBorder::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S45PacketTitle.class, S45PacketTitle::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S46PacketSetCompressionLevel.class, + S46PacketSetCompressionLevel::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S47PacketPlayerListHeaderFooter.class, + S47PacketPlayerListHeaderFooter::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S48PacketResourcePackSend.class, + S48PacketResourcePackSend::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S49PacketUpdateEntityNBT.class, + S49PacketUpdateEntityNBT::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C00PacketKeepAlive.class, C00PacketKeepAlive::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C01PacketChatMessage.class, C01PacketChatMessage::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C02PacketUseEntity.class, C02PacketUseEntity::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.class, C03PacketPlayer::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.C04PacketPlayerPosition.class, + C03PacketPlayer.C04PacketPlayerPosition::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.C05PacketPlayerLook.class, + C03PacketPlayer.C05PacketPlayerLook::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C03PacketPlayer.C06PacketPlayerPosLook.class, + C03PacketPlayer.C06PacketPlayerPosLook::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C07PacketPlayerDigging.class, + C07PacketPlayerDigging::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C08PacketPlayerBlockPlacement.class, + C08PacketPlayerBlockPlacement::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C09PacketHeldItemChange.class, + C09PacketHeldItemChange::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C0APacketAnimation.class, C0APacketAnimation::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C0BPacketEntityAction.class, + C0BPacketEntityAction::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C0CPacketInput.class, C0CPacketInput::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C0DPacketCloseWindow.class, C0DPacketCloseWindow::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C0EPacketClickWindow.class, C0EPacketClickWindow::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C0FPacketConfirmTransaction.class, + C0FPacketConfirmTransaction::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C10PacketCreativeInventoryAction.class, + C10PacketCreativeInventoryAction::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C11PacketEnchantItem.class, C11PacketEnchantItem::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C12PacketUpdateSign.class, C12PacketUpdateSign::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C13PacketPlayerAbilities.class, + C13PacketPlayerAbilities::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C14PacketTabComplete.class, C14PacketTabComplete::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C15PacketClientSettings.class, + C15PacketClientSettings::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C16PacketClientStatus.class, + C16PacketClientStatus::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C17PacketCustomPayload.class, + C17PacketCustomPayload::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C18PacketSpectate.class, C18PacketSpectate::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C19PacketResourcePackStatus.class, + C19PacketResourcePackStatus::new); } }, LOGIN(2) { { - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S00PacketDisconnect.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S01PacketEncryptionRequest.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S02PacketLoginSuccess.class); - this.registerPacket(EnumPacketDirection.CLIENTBOUND, S03PacketEnableCompression.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C00PacketLoginStart.class); - this.registerPacket(EnumPacketDirection.SERVERBOUND, C01PacketEncryptionResponse.class); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S00PacketDisconnect.class, S00PacketDisconnect::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S01PacketEncryptionRequest.class, + S01PacketEncryptionRequest::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S02PacketLoginSuccess.class, + S02PacketLoginSuccess::new); + this.registerPacket(EnumPacketDirection.CLIENTBOUND, S03PacketEnableCompression.class, + S03PacketEnableCompression::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C00PacketLoginStart.class, C00PacketLoginStart::new); + this.registerPacket(EnumPacketDirection.SERVERBOUND, C01PacketEncryptionResponse.class, + C01PacketEncryptionResponse::new); } }; @@ -278,12 +337,6 @@ public enum EnumConnectionState { + STATES_BY_CLASS.get(oclass) + " - can\'t reassign to " + enumconnectionstate); } - try { - oclass.newInstance(); - } catch (Throwable var10) { - throw new Error("Packet " + oclass + " fails instantiation checks! " + oclass); - } - STATES_BY_CLASS.put(oclass, enumconnectionstate); } } @@ -302,9 +355,11 @@ public enum EnumConnectionState { private final int id; private final Map>> directionMaps; + private final Map>>> directionCtors; private EnumConnectionState(int protocolId) { this.directionMaps = Maps.newEnumMap(EnumPacketDirection.class); + this.directionCtors = Maps.newEnumMap(EnumPacketDirection.class); this.id = protocolId; } @@ -314,28 +369,35 @@ public enum EnumConnectionState { public Packet getPacket(EnumPacketDirection direction, int packetId) throws IllegalAccessException, InstantiationException { - Class oclass = (Class) ((BiMap) this.directionMaps.get(direction)).get(Integer.valueOf(packetId)); - return oclass == null ? null : (Packet) oclass.newInstance(); + Supplier> oclass = this.directionCtors.get(direction).get(Integer.valueOf(packetId)); + return oclass == null ? null : oclass.get(); } public Integer getPacketId(EnumPacketDirection direction, Packet packetIn) { return (Integer) ((BiMap) this.directionMaps.get(direction)).inverse().get(packetIn.getClass()); } - protected EnumConnectionState registerPacket(EnumPacketDirection direction, Class packetClass) { - Object object = (BiMap) this.directionMaps.get(direction); + protected EnumConnectionState registerPacket(EnumPacketDirection direction, Class packetClass, + Supplier> packetCtor) { + BiMap> object = this.directionMaps.get(direction); + Map>> object2; if (object == null) { object = HashBiMap.create(); - this.directionMaps.put(direction, (BiMap>) object); + object2 = Maps.newHashMap(); + this.directionMaps.put(direction, object); + this.directionCtors.put(direction, object2); + } else { + object2 = this.directionCtors.get(direction); } - if (((BiMap) object).containsValue(packetClass)) { + if (object.containsValue(packetClass)) { String s = direction + " packet " + packetClass + " is already known to ID " - + ((BiMap) object).inverse().get(packetClass); + + object.inverse().get(packetClass); LogManager.getLogger().fatal(s); throw new IllegalArgumentException(s); } else { - ((BiMap) object).put(Integer.valueOf(((BiMap) object).size()), packetClass); + object.put(Integer.valueOf(object.size()), packetClass); + object2.put(Integer.valueOf(object2.size()), packetCtor); return this; } } diff --git a/src/game/java/net/minecraft/network/play/server/S24PacketBlockAction.java b/src/game/java/net/minecraft/network/play/server/S24PacketBlockAction.java index 5e157ee2..36d11e1b 100644 --- a/src/game/java/net/minecraft/network/play/server/S24PacketBlockAction.java +++ b/src/game/java/net/minecraft/network/play/server/S24PacketBlockAction.java @@ -7,6 +7,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.util.BlockPos; +import net.starlikeclient.StarlikeSettings; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -83,7 +84,7 @@ public class S24PacketBlockAction implements Packet { this.blockPosition = parPacketBuffer.readBlockPos(); this.instrument = parPacketBuffer.readUnsignedByte(); this.pitch = parPacketBuffer.readUnsignedByte(); - this.block = Block.getBlockById(parPacketBuffer.readVarIntFromBuffer() & 4095); + this.block = Block.getBlockById(parPacketBuffer.readVarIntFromBuffer() & (StarlikeSettings.blockIdLimit - 1)); } /** @@ -93,6 +94,6 @@ public class S24PacketBlockAction implements Packet { parPacketBuffer.writeBlockPos(this.blockPosition); parPacketBuffer.writeByte(this.instrument); parPacketBuffer.writeByte(this.pitch); - parPacketBuffer.writeVarIntToBuffer(Block.getIdFromBlock(this.block) & 4095); + parPacketBuffer.writeVarIntToBuffer(Block.getIdFromBlock(this.block) & (StarlikeSettings.blockIdLimit - 1)); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/server/MinecraftServer.java b/src/game/java/net/minecraft/server/MinecraftServer.java index 71d9aa07..609688e4 100644 --- a/src/game/java/net/minecraft/server/MinecraftServer.java +++ b/src/game/java/net/minecraft/server/MinecraftServer.java @@ -10,6 +10,7 @@ import java.util.concurrent.Callable; import com.google.common.collect.Lists; import net.lax1dude.eaglercraft.v1_8.EagRuntime; +import net.lax1dude.eaglercraft.v1_8.EagUtils; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import net.lax1dude.eaglercraft.v1_8.futures.FutureTask; @@ -675,7 +676,7 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre } } - Thread.sleep(Math.max(1L, 50L - i)); + EagUtils.sleep(Math.max(1L, 50L - i)); this.serverIsRunning = true; } } else { diff --git a/src/game/java/net/minecraft/stats/Achievement.java b/src/game/java/net/minecraft/stats/Achievement.java index 63888f37..ca4998bf 100644 --- a/src/game/java/net/minecraft/stats/Achievement.java +++ b/src/game/java/net/minecraft/stats/Achievement.java @@ -1,5 +1,7 @@ package net.minecraft.stats; +import java.util.function.Supplier; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -75,8 +77,9 @@ public class Achievement extends StatBase { this.parentAchievement = parent; } - public Achievement func_150953_b(Class parClass1) { - return (Achievement) super.func_150953_b(parClass1); + public Achievement func_150953_b(Class parClass1, + Supplier ctor) { + return (Achievement) super.func_150953_b(parClass1, ctor); } /** diff --git a/src/game/java/net/minecraft/stats/AchievementList.java b/src/game/java/net/minecraft/stats/AchievementList.java index ae61c36a..5fd11a75 100644 --- a/src/game/java/net/minecraft/stats/AchievementList.java +++ b/src/game/java/net/minecraft/stats/AchievementList.java @@ -137,7 +137,8 @@ public class AchievementList { fullBeacon = (new Achievement("achievement.fullBeacon", "fullBeacon", 7, 8, Blocks.beacon, killWither)) .setSpecial().registerStat(); exploreAllBiomes = (new Achievement("achievement.exploreAllBiomes", "exploreAllBiomes", 4, 8, - Items.diamond_boots, theEnd)).func_150953_b(JsonSerializableSet.class).setSpecial().registerStat(); + Items.diamond_boots, theEnd)).func_150953_b(JsonSerializableSet.class, JsonSerializableSet::new) + .setSpecial().registerStat(); overpowered = (new Achievement("achievement.overpowered", "overpowered", 6, 4, new ItemStack(Items.golden_apple, 1, 1), buildBetterPickaxe)).setSpecial().registerStat(); } diff --git a/src/game/java/net/minecraft/stats/StatBase.java b/src/game/java/net/minecraft/stats/StatBase.java index 7b44befc..322e8e3a 100644 --- a/src/game/java/net/minecraft/stats/StatBase.java +++ b/src/game/java/net/minecraft/stats/StatBase.java @@ -3,6 +3,7 @@ package net.minecraft.stats; import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.Locale; +import java.util.function.Supplier; import net.minecraft.event.HoverEvent; import net.minecraft.scoreboard.IScoreObjectiveCriteria; @@ -74,6 +75,7 @@ public class StatBase { private final IStatType type; private final IScoreObjectiveCriteria field_150957_c; private Class field_150956_d; + private Supplier field_150956_d_ctor; public StatBase(String statIdIn, IChatComponent statNameIn) { this(statIdIn, statNameIn, simpleStatType); @@ -106,8 +108,10 @@ public class StatBase { return this.field_150957_c; } - public StatBase func_150953_b(Class oclass) { + public StatBase func_150953_b(Class oclass, + Supplier octor) { this.field_150956_d = oclass; + this.field_150956_d_ctor = octor; return this; } @@ -115,6 +119,10 @@ public class StatBase { return this.field_150956_d; } + public Supplier func_150954_l_ctor() { + return this.field_150956_d_ctor; + } + public IChatComponent func_150955_j() { IChatComponent ichatcomponent = this.getStatName(); IChatComponent ichatcomponent1 = (new ChatComponentText("[")).appendSibling(ichatcomponent).appendText("]"); diff --git a/src/game/java/net/minecraft/stats/StatList.java b/src/game/java/net/minecraft/stats/StatList.java index ff0ae3e3..e016b09b 100644 --- a/src/game/java/net/minecraft/stats/StatList.java +++ b/src/game/java/net/minecraft/stats/StatList.java @@ -19,6 +19,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ResourceLocation; +import net.starlikeclient.StarlikeSettings; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -219,7 +220,7 @@ public class StatList { new ChatComponentTranslation("stat.workbenchInteraction", new Object[0]))).registerStat(); public static StatBase field_181723_aa = (new StatBasic("stat.chestOpened", new ChatComponentTranslation("stat.chestOpened", new Object[0]))).registerStat(); - public static final StatBase[] mineBlockStatArray = new StatBase[4096]; + public static final StatBase[] mineBlockStatArray = new StatBase[StarlikeSettings.blockIdLimit]; /** * + Tracks the number of items a given block or item has been crafted. */ diff --git a/src/game/java/net/minecraft/stats/StatisticsFile.java b/src/game/java/net/minecraft/stats/StatisticsFile.java index e97b86c0..a46e8cb0 100644 --- a/src/game/java/net/minecraft/stats/StatisticsFile.java +++ b/src/game/java/net/minecraft/stats/StatisticsFile.java @@ -1,6 +1,5 @@ package net.minecraft.stats; -import java.lang.reflect.Constructor; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -147,9 +146,8 @@ public class StatisticsFile extends StatFileWriter { if (jsonobject1.has("progress") && statbase.func_150954_l() != null) { try { - Constructor constructor = statbase.func_150954_l().getConstructor(); - IJsonSerializable ijsonserializable = (IJsonSerializable) constructor - .newInstance(new Object[0]); + IJsonSerializable ijsonserializable = (IJsonSerializable) statbase.func_150954_l_ctor() + .get(); ijsonserializable.fromJson(jsonobject1.get("progress")); tupleintjsonserializable.setJsonSerializableValue(ijsonserializable); } catch (Throwable throwable) { diff --git a/src/game/java/net/minecraft/tileentity/TileEntity.java b/src/game/java/net/minecraft/tileentity/TileEntity.java index 2960652b..24d624a7 100644 --- a/src/game/java/net/minecraft/tileentity/TileEntity.java +++ b/src/game/java/net/minecraft/tileentity/TileEntity.java @@ -2,6 +2,7 @@ package net.minecraft.tileentity; import java.util.Map; import java.util.concurrent.Callable; +import java.util.function.Supplier; import com.google.common.collect.Maps; @@ -44,40 +45,42 @@ import net.minecraft.world.World; public abstract class TileEntity { private static final Logger logger = LogManager.getLogger(); private static Map> nameToClassMap = Maps.newHashMap(); + private static Map> nameToCtorMap = Maps.newHashMap(); private static Map, String> classToNameMap = Maps.newHashMap(); static { - addMapping(TileEntityFurnace.class, "Furnace"); - addMapping(TileEntityChest.class, "Chest"); - addMapping(TileEntityEnderChest.class, "EnderChest"); - addMapping(BlockJukebox.TileEntityJukebox.class, "RecordPlayer"); - addMapping(TileEntityDispenser.class, "Trap"); - addMapping(TileEntityDropper.class, "Dropper"); - addMapping(TileEntitySign.class, "Sign"); - addMapping(TileEntityMobSpawner.class, "MobSpawner"); - addMapping(TileEntityNote.class, "Music"); - addMapping(TileEntityPiston.class, "Piston"); - addMapping(TileEntityBrewingStand.class, "Cauldron"); - addMapping(TileEntityEnchantmentTable.class, "EnchantTable"); - addMapping(TileEntityEndPortal.class, "Airportal"); - addMapping(TileEntityCommandBlock.class, "Control"); - addMapping(TileEntityBeacon.class, "Beacon"); - addMapping(TileEntitySkull.class, "Skull"); - addMapping(TileEntityDaylightDetector.class, "DLDetector"); - addMapping(TileEntityHopper.class, "Hopper"); - addMapping(TileEntityComparator.class, "Comparator"); - addMapping(TileEntityFlowerPot.class, "FlowerPot"); - addMapping(TileEntityBanner.class, "Banner"); + addMapping(TileEntityFurnace.class, TileEntityFurnace::new, "Furnace"); + addMapping(TileEntityChest.class, TileEntityChest::new, "Chest"); + addMapping(TileEntityEnderChest.class, TileEntityEnderChest::new, "EnderChest"); + addMapping(BlockJukebox.TileEntityJukebox.class, BlockJukebox.TileEntityJukebox::new, "RecordPlayer"); + addMapping(TileEntityDispenser.class, TileEntityDispenser::new, "Trap"); + addMapping(TileEntityDropper.class, TileEntityDropper::new, "Dropper"); + addMapping(TileEntitySign.class, TileEntitySign::new, "Sign"); + addMapping(TileEntityMobSpawner.class, TileEntityMobSpawner::new, "MobSpawner"); + addMapping(TileEntityNote.class, TileEntityNote::new, "Music"); + addMapping(TileEntityPiston.class, TileEntityPiston::new, "Piston"); + addMapping(TileEntityBrewingStand.class, TileEntityBrewingStand::new, "Cauldron"); + addMapping(TileEntityEnchantmentTable.class, TileEntityEnchantmentTable::new, "EnchantTable"); + addMapping(TileEntityEndPortal.class, TileEntityEndPortal::new, "Airportal"); + addMapping(TileEntityCommandBlock.class, TileEntityCommandBlock::new, "Control"); + addMapping(TileEntityBeacon.class, TileEntityBeacon::new, "Beacon"); + addMapping(TileEntitySkull.class, TileEntitySkull::new, "Skull"); + addMapping(TileEntityDaylightDetector.class, TileEntityDaylightDetector::new, "DLDetector"); + addMapping(TileEntityHopper.class, TileEntityHopper::new, "Hopper"); + addMapping(TileEntityComparator.class, TileEntityComparator::new, "Comparator"); + addMapping(TileEntityFlowerPot.class, TileEntityFlowerPot::new, "FlowerPot"); + addMapping(TileEntityBanner.class, TileEntityBanner::new, "Banner"); } /** * + Adds a new two-way mapping between the class and its string name in both * hashmaps. */ - private static void addMapping(Class cl, String id) { + private static void addMapping(Class cl, Supplier ct, String id) { if (nameToClassMap.containsKey(id)) { throw new IllegalArgumentException("Duplicate id: " + id); } else { nameToClassMap.put(id, cl); + nameToCtorMap.put(id, ct); classToNameMap.put(cl, id); } } @@ -89,9 +92,9 @@ public abstract class TileEntity { TileEntity tileentity = null; try { - Class oclass = (Class) nameToClassMap.get(nbt.getString("id")); + Supplier oclass = nameToCtorMap.get(nbt.getString("id")); if (oclass != null) { - tileentity = (TileEntity) oclass.newInstance(); + tileentity = (TileEntity) oclass.get(); } } catch (Exception exception) { logger.error("Could not create TileEntity", exception); diff --git a/src/game/java/net/minecraft/tileentity/TileEntityBeacon.java b/src/game/java/net/minecraft/tileentity/TileEntityBeacon.java index f2f7bd2b..5a4221c8 100644 --- a/src/game/java/net/minecraft/tileentity/TileEntityBeacon.java +++ b/src/game/java/net/minecraft/tileentity/TileEntityBeacon.java @@ -249,8 +249,9 @@ public class TileEntityBeacon extends TileEntityLockable implements ITickable, I * stack size) into the given slot. */ public boolean isItemValidForSlot(int index, ItemStack stack) { - return stack.getItem() == Items.emerald || stack.getItem() == Items.diamond - || stack.getItem() == Items.gold_ingot || stack.getItem() == Items.iron_ingot; + return stack.getItem() == Items.netherite_ingot || stack.getItem() == Items.emerald + || stack.getItem() == Items.diamond || stack.getItem() == Items.gold_ingot + || stack.getItem() == Items.iron_ingot; } /** @@ -423,7 +424,8 @@ public class TileEntityBeacon extends TileEntityLockable implements ITickable, I for (int j1 = j - l1; j1 <= j + l1 && flag1; ++j1) { for (int k1 = l - l1; k1 <= l + l1; ++k1) { Block block = this.worldObj.getBlockState(new BlockPos(j1, i2, k1)).getBlock(); - if (block != Blocks.emerald_block && block != Blocks.gold_block && block != Blocks.diamond_block + if (block != Blocks.netherite_block && block != Blocks.emerald_block + && block != Blocks.gold_block && block != Blocks.diamond_block && block != Blocks.iron_block) { flag1 = false; break; diff --git a/src/game/java/net/minecraft/world/biome/BiomeDecorator.java b/src/game/java/net/minecraft/world/biome/BiomeDecorator.java index 75aab893..f93432f1 100644 --- a/src/game/java/net/minecraft/world/biome/BiomeDecorator.java +++ b/src/game/java/net/minecraft/world/biome/BiomeDecorator.java @@ -77,6 +77,9 @@ public class BiomeDecorator { protected WorldGenerator lapisGen; protected WorldGenerator platinumGen; protected WorldGenerator titaniumGen; + protected WorldGenerator copperGen; + protected WorldGenerator limestoneGen; + protected WorldGenerator tuffGen; protected WorldGenFlowers yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower, BlockFlower.EnumFlowerType.DANDELION); @@ -181,6 +184,11 @@ public class BiomeDecorator { this.chunkProviderSettings.platinumSize); this.titaniumGen = new WorldGenMinable(Blocks.titanium_ore.getDefaultState(), this.chunkProviderSettings.titaniumSize); + this.copperGen = new WorldGenMinable(Blocks.copper_ore.getDefaultState(), + this.chunkProviderSettings.copperSize); + this.tuffGen = new WorldGenMinable(Blocks.tuff.getDefaultState(), this.chunkProviderSettings.tuffSize); + this.limestoneGen = new WorldGenMinable(Blocks.limestone.getDefaultState(), + this.chunkProviderSettings.limestoneSize); this.genDecorations(parBiomeGenBase); this.currentWorld = null; this.randomGenerator = null; @@ -429,6 +437,12 @@ public class BiomeDecorator { this.chunkProviderSettings.platinumMinHeight, this.chunkProviderSettings.platinumMaxHeight); this.genStandardOre1(this.chunkProviderSettings.titaniumCount, this.titaniumGen, this.chunkProviderSettings.titaniumMinHeight, this.chunkProviderSettings.titaniumMaxHeight); + this.genStandardOre1(this.chunkProviderSettings.copperCount, this.copperGen, + this.chunkProviderSettings.copperMinHeight, this.chunkProviderSettings.copperMaxHeight); + this.genStandardOre1(this.chunkProviderSettings.limestoneCount, this.limestoneGen, + this.chunkProviderSettings.limestoneMinHeight, this.chunkProviderSettings.limestoneMaxHeight); + this.genStandardOre1(this.chunkProviderSettings.tuffCount, this.tuffGen, + this.chunkProviderSettings.tuffMinHeight, this.chunkProviderSettings.tuffMaxHeight); } /** diff --git a/src/game/java/net/minecraft/world/biome/BiomeGenBase.java b/src/game/java/net/minecraft/world/biome/BiomeGenBase.java index 7187b26b..a219eb3f 100644 --- a/src/game/java/net/minecraft/world/biome/BiomeGenBase.java +++ b/src/game/java/net/minecraft/world/biome/BiomeGenBase.java @@ -173,6 +173,7 @@ public abstract class BiomeGenBase { public static BiomeGenBase mesa; public static BiomeGenBase mesaPlateau_F; public static BiomeGenBase mesaPlateau; + public static BiomeGenBase field_180279_ad; protected static NoiseGeneratorPerlin temperatureNoise; protected static NoiseGeneratorPerlin GRASS_COLOR_NOISE; @@ -252,6 +253,7 @@ public abstract class BiomeGenBase { .setHeight(height_HighPlateaus); mesaPlateau = (new BiomeGenMesa(39, false, false)).setColor(13274213).setBiomeName("Mesa Plateau") .setHeight(height_HighPlateaus); + field_180279_ad = ocean; plains.createMutation(); @@ -274,7 +276,6 @@ public abstract class BiomeGenBase { megaTaiga.createMutation(); extremeHills.createMutation(); extremeHillsPlus.createMutation(); - megaTaiga.createMutatedBiome(megaTaigaHills.biomeID + 128).setBiomeName("Redwood Taiga Hills M"); explorationBiomesList.clear(); @@ -342,7 +343,7 @@ public abstract class BiomeGenBase { public float rainfall; public int waterColorMultiplier; public BiomeDecorator theBiomeDecorator; - protected List spawnableMonsterList; + public List spawnableMonsterList; protected List spawnableCreatureList; protected List spawnableWaterCreatureList; diff --git a/src/game/java/net/minecraft/world/biome/BiomeGenEnd.java b/src/game/java/net/minecraft/world/biome/BiomeGenEnd.java index 88933697..1c6995a7 100644 --- a/src/game/java/net/minecraft/world/biome/BiomeGenEnd.java +++ b/src/game/java/net/minecraft/world/biome/BiomeGenEnd.java @@ -2,6 +2,7 @@ package net.minecraft.world.biome; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.init.Blocks; +import net.starlikeclient.minecraft.init.EntitiesStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -34,6 +35,9 @@ public class BiomeGenEnd extends BiomeGenBase { this.spawnableWaterCreatureList.clear(); this.spawnableCaveCreatureList.clear(); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityEnderman.class, 10, 4, 4)); + + EntitiesStarlike.configEndEntities(this); + this.topBlock = Blocks.dirt.getDefaultState(); this.fillerBlock = Blocks.dirt.getDefaultState(); this.theBiomeDecorator = new BiomeEndDecorator(); diff --git a/src/game/java/net/minecraft/world/biome/BiomeGenHell.java b/src/game/java/net/minecraft/world/biome/BiomeGenHell.java index d9358f31..1b118af7 100644 --- a/src/game/java/net/minecraft/world/biome/BiomeGenHell.java +++ b/src/game/java/net/minecraft/world/biome/BiomeGenHell.java @@ -2,8 +2,8 @@ package net.minecraft.world.biome; import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityMagmaCube; -import net.minecraft.entity.monster.EntityNetherCreeper; import net.minecraft.entity.monster.EntityPigZombie; +import net.starlikeclient.minecraft.init.EntitiesStarlike; /** * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source @@ -38,7 +38,7 @@ public class BiomeGenHell extends BiomeGenBase { this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityGhast.class, 50, 4, 4)); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityPigZombie.class, 100, 4, 4)); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityMagmaCube.class, 1, 4, 4)); - this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityNetherCreeper.class, 100, 4, 1)); + EntitiesStarlike.configNetherEntities(this); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/ChunkProviderGenerate.java b/src/game/java/net/minecraft/world/gen/ChunkProviderGenerate.java index 2db0c7ee..bb12a2de 100644 --- a/src/game/java/net/minecraft/world/gen/ChunkProviderGenerate.java +++ b/src/game/java/net/minecraft/world/gen/ChunkProviderGenerate.java @@ -531,11 +531,11 @@ public class ChunkProviderGenerate implements IChunkProvider { Blocks.stone.getDefaultState()); } else { parChunkPrimer.setBlockState(i * 4 + k2, i2 * 8 + j2, l * 4 + l2, - Blocks.deepstone.getDefaultState()); + Blocks.deepslate.getDefaultState()); } } else { parChunkPrimer.setBlockState(i * 4 + k2, i2 * 8 + j2, l * 4 + l2, - Blocks.deepstone.getDefaultState()); + Blocks.deepslate.getDefaultState()); } } else { parChunkPrimer.setBlockState(i * 4 + k2, i2 * 8 + j2, l * 4 + l2, diff --git a/src/game/java/net/minecraft/world/gen/ChunkProviderHell.java b/src/game/java/net/minecraft/world/gen/ChunkProviderHell.java index be39462f..70f00c2f 100644 --- a/src/game/java/net/minecraft/world/gen/ChunkProviderHell.java +++ b/src/game/java/net/minecraft/world/gen/ChunkProviderHell.java @@ -89,8 +89,14 @@ public class ChunkProviderHell implements IChunkProvider { double[] noiseData4; double[] noiseData5; + private final WorldGenerator netheriteOreGen1 = new WorldGenMinable(Blocks.ancient_debris.getDefaultState(), 3, + BlockHelper.forBlock(Blocks.netherrack)); + private final WorldGenerator netheriteOreGen2 = new WorldGenMinable(Blocks.ancient_debris.getDefaultState(), 2, + BlockHelper.forBlock(Blocks.netherrack)); private final WorldGenerator uraniumOreGen = new WorldGenMinable(Blocks.uranium_ore.getDefaultState(), 4, BlockHelper.forBlock(Blocks.netherrack)); + private final WorldGenerator soulstoneOreGen = new WorldGenMinable(Blocks.soul_stone.getDefaultState(), 30, + BlockHelper.forBlock(Blocks.netherrack)); public ChunkProviderHell(World worldIn, boolean parFlag, long parLong1) { this.worldObj = worldIn; @@ -412,11 +418,6 @@ public class ChunkProviderHell implements IChunkProvider { this.hellRNG.nextInt(128), this.hellRNG.nextInt(16) + 8)); } - for (int k1 = 0; k1 < 8; ++k1) { - this.uraniumOreGen.generate(this.worldObj, this.hellRNG, - blockpos.add(this.hellRNG.nextInt(16), this.hellRNG.nextInt(108) + 10, this.hellRNG.nextInt(16))); - } - for (int k1 = 0; k1 < 16; ++k1) { this.field_177467_w.generate(this.worldObj, this.hellRNG, blockpos.add(this.hellRNG.nextInt(16), this.hellRNG.nextInt(108) + 10, this.hellRNG.nextInt(16))); @@ -427,6 +428,26 @@ public class ChunkProviderHell implements IChunkProvider { blockpos.add(this.hellRNG.nextInt(16), this.hellRNG.nextInt(108) + 10, this.hellRNG.nextInt(16))); } + for (int k1 = 0; k1 < 3; ++k1) { + this.netheriteOreGen1.generate(this.worldObj, this.hellRNG, blockpos.add(this.hellRNG.nextInt(16), + ((this.hellRNG.nextInt(17) + this.hellRNG.nextInt(17)) / 2) + 8, this.hellRNG.nextInt(16))); + } + + for (int k1 = 0; k1 < 2; ++k1) { + this.netheriteOreGen2.generate(this.worldObj, this.hellRNG, + blockpos.add(this.hellRNG.nextInt(16), this.hellRNG.nextInt(112) + 8, this.hellRNG.nextInt(16))); + } + + for (int k1 = 0; k1 < 8; ++k1) { + this.uraniumOreGen.generate(this.worldObj, this.hellRNG, + blockpos.add(this.hellRNG.nextInt(16), this.hellRNG.nextInt(108) + 10, this.hellRNG.nextInt(16))); + } + + for (int k1 = 0; k1 < 5; ++k1) { + this.soulstoneOreGen.generate(this.worldObj, this.hellRNG, + blockpos.add(this.hellRNG.nextInt(16), this.hellRNG.nextInt(108) + 10, this.hellRNG.nextInt(16))); + } + BlockFalling.fallInstantly = false; } diff --git a/src/game/java/net/minecraft/world/gen/ChunkProviderSettings.java b/src/game/java/net/minecraft/world/gen/ChunkProviderSettings.java index 211a9a96..4859725f 100644 --- a/src/game/java/net/minecraft/world/gen/ChunkProviderSettings.java +++ b/src/game/java/net/minecraft/world/gen/ChunkProviderSettings.java @@ -107,7 +107,7 @@ public class ChunkProviderSettings { public int ironMinHeight = 30; public int ironMaxHeight = 128; public int goldSize = 9; - public int goldCount = 2; + public int goldCount = 7; public int goldMinHeight = 0; public int goldMaxHeight = 32; public int redstoneSize = 8; @@ -115,21 +115,33 @@ public class ChunkProviderSettings { public int redstoneMinHeight = 0; public int redstoneMaxHeight = 32; public int diamondSize = 8; - public int diamondCount = 1; + public int diamondCount = 4; public int diamondMinHeight = 0; - public int diamondMaxHeight = 16; + public int diamondMaxHeight = 24; public int lapisSize = 7; public int lapisCount = 1; public int lapisCenterHeight = 16; public int lapisSpread = 16; - public int platinumSize = 4; + public int platinumSize = 5; public int platinumCount = 3; public int platinumMinHeight = 0; public int platinumMaxHeight = 17; - public int titaniumSize = 2; - public int titaniumCount = 1; + public int titaniumSize = 3; + public int titaniumCount = 2; public int titaniumMinHeight = 0; - public int titaniumMaxHeight = 10; + public int titaniumMaxHeight = 13; + public int copperSize = 17; + public int copperCount = 20; + public int copperMinHeight = 0; + public int copperMaxHeight = 128; + public int limestoneSize = 33; + public int limestoneCount = 10; + public int limestoneMinHeight = 0; + public int limestoneMaxHeight = 80; + public int tuffSize = 33; + public int tuffCount = 10; + public int tuffMinHeight = 0; + public int tuffMaxHeight = 80; public Factory() { this.func_177863_a(); @@ -389,7 +401,7 @@ public class ChunkProviderSettings { this.ironMinHeight = 30; this.ironMaxHeight = 128; this.goldSize = 9; - this.goldCount = 2; + this.goldCount = 7; this.goldMinHeight = 0; this.goldMaxHeight = 32; this.redstoneSize = 8; @@ -397,21 +409,33 @@ public class ChunkProviderSettings { this.redstoneMinHeight = 0; this.redstoneMaxHeight = 32; this.diamondSize = 8; - this.diamondCount = 1; + this.diamondCount = 4; this.diamondMinHeight = 0; - this.diamondMaxHeight = 16; + this.diamondMaxHeight = 24; this.lapisSize = 7; this.lapisCount = 1; this.lapisCenterHeight = 16; this.lapisSpread = 16; - this.platinumSize = 4; - this.platinumCount = 8; + this.platinumSize = 5; + this.platinumCount = 3; this.platinumMinHeight = 0; this.platinumMaxHeight = 17; - this.titaniumSize = 2; - this.titaniumCount = 4; + this.titaniumSize = 3; + this.titaniumCount = 2; this.titaniumMinHeight = 0; - this.titaniumMaxHeight = 10; + this.titaniumMaxHeight = 13; + this.copperSize = 17; + this.copperCount = 20; + this.copperMinHeight = 0; + this.copperMaxHeight = 128; + this.limestoneSize = 33; + this.limestoneCount = 10; + this.limestoneMinHeight = 0; + this.limestoneMaxHeight = 80; + this.tuffSize = 33; + this.tuffCount = 10; + this.tuffMinHeight = 0; + this.tuffMaxHeight = 80; } public ChunkProviderSettings func_177864_b() { @@ -770,6 +794,19 @@ public class ChunkProviderSettings { jsonobject.put("titaniumCount", Integer.valueOf(parFactory.titaniumCount)); jsonobject.put("titaniumMinHeight", Integer.valueOf(parFactory.titaniumMinHeight)); jsonobject.put("titaniumMaxHeight", Integer.valueOf(parFactory.titaniumMaxHeight)); + jsonobject.put("copperSize", Integer.valueOf(parFactory.copperSize)); + jsonobject.put("copperCount", Integer.valueOf(parFactory.copperCount)); + jsonobject.put("copperMinHeight", Integer.valueOf(parFactory.copperMinHeight)); + jsonobject.put("copperMaxHeight", Integer.valueOf(parFactory.copperMaxHeight)); + jsonobject.put("limestoneSize", Integer.valueOf(parFactory.limestoneSize)); + jsonobject.put("limestoneCount", Integer.valueOf(parFactory.limestoneCount)); + jsonobject.put("limestoneMinHeight", Integer.valueOf(parFactory.limestoneMinHeight)); + jsonobject.put("limestoneMaxHeight", Integer.valueOf(parFactory.limestoneMaxHeight)); + + jsonobject.put("tuffSize", Integer.valueOf(parFactory.tuffSize)); + jsonobject.put("tuffCount", Integer.valueOf(parFactory.tuffCount)); + jsonobject.put("tuffMinHeight", Integer.valueOf(parFactory.tuffMinHeight)); + jsonobject.put("tuffMaxHeight", Integer.valueOf(parFactory.tuffMaxHeight)); return jsonobject; } } @@ -860,6 +897,18 @@ public class ChunkProviderSettings { public final int titaniumCount; public final int titaniumMinHeight; public final int titaniumMaxHeight; + public final int copperSize; + public final int copperCount; + public final int copperMinHeight; + public final int copperMaxHeight; + public final int limestoneSize; + public final int limestoneCount; + public final int limestoneMinHeight; + public final int limestoneMaxHeight; + public final int tuffSize; + public final int tuffCount; + public final int tuffMinHeight; + public final int tuffMaxHeight; private ChunkProviderSettings(ChunkProviderSettings.Factory settingsFactory) { this.coordinateScale = settingsFactory.coordinateScale; @@ -948,5 +997,17 @@ public class ChunkProviderSettings { this.titaniumCount = settingsFactory.titaniumCount; this.titaniumMinHeight = settingsFactory.titaniumMinHeight; this.titaniumMaxHeight = settingsFactory.titaniumMaxHeight; + this.copperSize = settingsFactory.copperSize; + this.copperCount = settingsFactory.copperCount; + this.copperMinHeight = settingsFactory.copperMinHeight; + this.copperMaxHeight = settingsFactory.copperMaxHeight; + this.limestoneSize = settingsFactory.limestoneSize; + this.limestoneCount = settingsFactory.limestoneCount; + this.limestoneMinHeight = settingsFactory.limestoneMinHeight; + this.limestoneMaxHeight = settingsFactory.limestoneMaxHeight; + this.tuffSize = settingsFactory.tuffSize; + this.tuffCount = settingsFactory.tuffCount; + this.tuffMinHeight = settingsFactory.tuffMinHeight; + this.tuffMaxHeight = settingsFactory.tuffMaxHeight; } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/MapGenCaves.java b/src/game/java/net/minecraft/world/gen/MapGenCaves.java index d52931b8..cef7f9af 100644 --- a/src/game/java/net/minecraft/world/gen/MapGenCaves.java +++ b/src/game/java/net/minecraft/world/gen/MapGenCaves.java @@ -44,7 +44,7 @@ public class MapGenCaves extends MapGenBase { protected boolean func_175793_a(IBlockState parIBlockState, IBlockState parIBlockState2) { return parIBlockState.getBlock() == Blocks.stone ? true : (parIBlockState.getBlock() == Blocks.dirt ? true - : (parIBlockState.getBlock() == Blocks.deepstone ? true + : (parIBlockState.getBlock() == Blocks.deepslate ? true : (parIBlockState.getBlock() == Blocks.grass ? true : (parIBlockState.getBlock() == Blocks.hardened_clay ? true : (parIBlockState.getBlock() == Blocks.stained_hardened_clay ? true diff --git a/src/game/java/net/minecraft/world/gen/feature/WorldGenDungeons.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenDungeons.java index 1fc036b8..6e3ecc91 100644 --- a/src/game/java/net/minecraft/world/gen/feature/WorldGenDungeons.java +++ b/src/game/java/net/minecraft/world/gen/feature/WorldGenDungeons.java @@ -110,9 +110,9 @@ public class WorldGenDungeons extends WorldGenerator { } else if (world.getBlockState(blockpos2).getBlock().getMaterial().isSolid() && world.getBlockState(blockpos2).getBlock() != Blocks.chest) { if (j3 == -1 && random.nextInt(4) != 0) { - world.setBlockState(blockpos2, Blocks.mossy_cobblestone.getDefaultState(), 2); + world.setBlockState(blockpos2, Blocks.stonebrick.getStateFromMeta(1), 2); } else { - world.setBlockState(blockpos2, Blocks.cobblestone.getDefaultState(), 2); + world.setBlockState(blockpos2, Blocks.stonebrick.getDefaultState(), 2); } } } diff --git a/src/game/java/net/minecraft/world/gen/feature/WorldGenMinable.java b/src/game/java/net/minecraft/world/gen/feature/WorldGenMinable.java index ba7f38c1..7a6a3f16 100644 --- a/src/game/java/net/minecraft/world/gen/feature/WorldGenMinable.java +++ b/src/game/java/net/minecraft/world/gen/feature/WorldGenMinable.java @@ -86,7 +86,7 @@ public class WorldGenMinable extends WorldGenerator { IBlockState currentState = world.getBlockState(blockpos1); if (blockpos1.getY() < 20 && (currentState.getBlock() == Blocks.stone - || currentState.getBlock() == Blocks.deepstone)) { + || currentState.getBlock() == Blocks.deepslate)) { world.setBlockState(blockpos1, this.oreBlock, 2); } else if (this.predicate.apply(currentState)) { world.setBlockState(blockpos1, this.oreBlock, 2); diff --git a/src/game/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java b/src/game/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java index 96d7a52b..eec69672 100644 --- a/src/game/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java +++ b/src/game/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java @@ -974,8 +974,11 @@ public class ComponentScatteredFeaturePieces { } public static void registerScatteredFeaturePieces() { - MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.DesertPyramid.class, "TeDP"); - MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.JunglePyramid.class, "TeJP"); - MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.SwampHut.class, "TeSH"); + MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.DesertPyramid.class, + ComponentScatteredFeaturePieces.DesertPyramid::new, "TeDP"); + MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.JunglePyramid.class, + ComponentScatteredFeaturePieces.JunglePyramid::new, "TeJP"); + MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.SwampHut.class, + ComponentScatteredFeaturePieces.SwampHut::new, "TeSH"); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/structure/MapGenStructureIO.java b/src/game/java/net/minecraft/world/gen/structure/MapGenStructureIO.java index 87d7e3a6..78bd77b2 100644 --- a/src/game/java/net/minecraft/world/gen/structure/MapGenStructureIO.java +++ b/src/game/java/net/minecraft/world/gen/structure/MapGenStructureIO.java @@ -1,6 +1,7 @@ package net.minecraft.world.gen.structure; import java.util.Map; +import java.util.function.Supplier; import com.google.common.collect.Maps; @@ -35,17 +36,20 @@ import net.minecraft.world.World; public class MapGenStructureIO { private static final Logger logger = LogManager.getLogger(); private static Map> startNameToClassMap = Maps.newHashMap(); + private static Map> startNameToSupplierMap = Maps.newHashMap(); private static Map, String> startClassToNameMap = Maps.newHashMap(); private static Map> componentNameToClassMap = Maps.newHashMap(); + private static Map> componentNameToSupplierMap = Maps.newHashMap(); private static Map, String> componentClassToNameMap = Maps.newHashMap(); static { - registerStructure(StructureMineshaftStart.class, "Mineshaft"); - registerStructure(MapGenVillage.Start.class, "Village"); - registerStructure(MapGenNetherBridge.Start.class, "Fortress"); - registerStructure(MapGenStronghold.Start.class, "Stronghold"); - registerStructure(MapGenScatteredFeature.Start.class, "Temple"); - registerStructure(StructureOceanMonument.StartMonument.class, "Monument"); + registerStructure(StructureMineshaftStart.class, StructureMineshaftStart::new, "Mineshaft"); + registerStructure(MapGenVillage.Start.class, MapGenVillage.Start::new, "Village"); + registerStructure(MapGenNetherBridge.Start.class, MapGenNetherBridge.Start::new, "Fortress"); + registerStructure(MapGenStronghold.Start.class, MapGenStronghold.Start::new, "Stronghold"); + registerStructure(MapGenScatteredFeature.Start.class, MapGenScatteredFeature.Start::new, "Temple"); + registerStructure(StructureOceanMonument.StartMonument.class, StructureOceanMonument.StartMonument::new, + "Monument"); StructureMineshaftPieces.registerStructurePieces(); StructureVillagePieces.registerVillagePieces(); StructureNetherBridgePieces.registerNetherFortressPieces(); @@ -58,9 +62,10 @@ public class MapGenStructureIO { StructureComponent structurecomponent = null; try { - Class oclass = (Class) componentNameToClassMap.get(tagCompound.getString("id")); + Supplier oclass = componentNameToSupplierMap.get(tagCompound.getString("id")); if (oclass != null) { - structurecomponent = (StructureComponent) oclass.newInstance(); + structurecomponent = oclass.get(); + ; } } catch (Exception exception) { logger.warn("Failed Piece with id " + tagCompound.getString("id")); @@ -84,9 +89,9 @@ public class MapGenStructureIO { StructureStart structurestart = null; try { - Class oclass = (Class) startNameToClassMap.get(tagCompound.getString("id")); + Supplier oclass = startNameToSupplierMap.get(tagCompound.getString("id")); if (oclass != null) { - structurestart = (StructureStart) oclass.newInstance(); + structurestart = oclass.get(); } } catch (Exception exception) { logger.warn("Failed Start with id " + tagCompound.getString("id")); @@ -106,13 +111,17 @@ public class MapGenStructureIO { return (String) startClassToNameMap.get(start.getClass()); } - private static void registerStructure(Class startClass, String structureName) { + private static void registerStructure(Class startClass, + Supplier startSupplier, String structureName) { startNameToClassMap.put(structureName, startClass); + startNameToSupplierMap.put(structureName, startSupplier); startClassToNameMap.put(startClass, structureName); } - static void registerStructureComponent(Class componentClass, String componentName) { + static void registerStructureComponent(Class componentClass, + Supplier startSupplier, String componentName) { componentNameToClassMap.put(componentName, componentClass); + componentNameToSupplierMap.put(componentName, startSupplier); componentClassToNameMap.put(componentClass, componentName); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java index 0d5b8563..1a13c17e 100644 --- a/src/game/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java +++ b/src/game/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java @@ -826,9 +826,13 @@ public class StructureMineshaftPieces { } public static void registerStructurePieces() { - MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Corridor.class, "MSCorridor"); - MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Cross.class, "MSCrossing"); - MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Room.class, "MSRoom"); - MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Stairs.class, "MSStairs"); + MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Corridor.class, + StructureMineshaftPieces.Corridor::new, "MSCorridor"); + MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Cross.class, + StructureMineshaftPieces.Cross::new, "MSCrossing"); + MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Room.class, + StructureMineshaftPieces.Room::new, "MSRoom"); + MapGenStructureIO.registerStructureComponent(StructureMineshaftPieces.Stairs.class, + StructureMineshaftPieces.Stairs::new, "MSStairs"); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java index 22aee858..24702dc5 100644 --- a/src/game/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java +++ b/src/game/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java @@ -1672,20 +1672,35 @@ public class StructureNetherBridgePieces { } public static void registerNetherFortressPieces() { - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Crossing3.class, "NeBCr"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.End.class, "NeBEF"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Straight.class, "NeBS"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor3.class, "NeCCS"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor4.class, "NeCTB"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Entrance.class, "NeCE"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Crossing2.class, "NeSCSC"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor.class, "NeSCLT"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor5.class, "NeSC"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor2.class, "NeSCRT"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.NetherStalkRoom.class, "NeCSR"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Throne.class, "NeMT"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Crossing.class, "NeRC"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Stairs.class, "NeSR"); - MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Start.class, "NeStart"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Crossing3.class, + StructureNetherBridgePieces.Crossing3::new, "NeBCr"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.End.class, + StructureNetherBridgePieces.End::new, "NeBEF"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Straight.class, + StructureNetherBridgePieces.Straight::new, "NeBS"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor3.class, + StructureNetherBridgePieces.Corridor3::new, "NeCCS"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor4.class, + StructureNetherBridgePieces.Corridor4::new, "NeCTB"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Entrance.class, + StructureNetherBridgePieces.Entrance::new, "NeCE"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Crossing2.class, + StructureNetherBridgePieces.Crossing2::new, "NeSCSC"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor.class, + StructureNetherBridgePieces.Corridor::new, "NeSCLT"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor5.class, + StructureNetherBridgePieces.Corridor5::new, "NeSC"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Corridor2.class, + StructureNetherBridgePieces.Corridor2::new, "NeSCRT"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.NetherStalkRoom.class, + StructureNetherBridgePieces.NetherStalkRoom::new, "NeCSR"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Throne.class, + StructureNetherBridgePieces.Throne::new, "NeMT"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Crossing.class, + StructureNetherBridgePieces.Crossing::new, "NeRC"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Stairs.class, + StructureNetherBridgePieces.Stairs::new, "NeSR"); + MapGenStructureIO.registerStructureComponent(StructureNetherBridgePieces.Start.class, + StructureNetherBridgePieces.Start::new, "NeStart"); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java index e756fdc7..8b31f9e0 100644 --- a/src/game/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java +++ b/src/game/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java @@ -2277,16 +2277,27 @@ public class StructureOceanMonumentPieces { } public static void registerOceanMonumentPieces() { - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.MonumentBuilding.class, "OMB"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.MonumentCoreRoom.class, "OMCR"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleXRoom.class, "OMDXR"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleXYRoom.class, "OMDXYR"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleYRoom.class, "OMDYR"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleYZRoom.class, "OMDYZR"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleZRoom.class, "OMDZR"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.EntryRoom.class, "OMEntry"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.Penthouse.class, "OMPenthouse"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.SimpleRoom.class, "OMSimple"); - MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.SimpleTopRoom.class, "OMSimpleT"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.MonumentBuilding.class, + StructureOceanMonumentPieces.MonumentBuilding::new, "OMB"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.MonumentCoreRoom.class, + StructureOceanMonumentPieces.MonumentCoreRoom::new, "OMCR"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleXRoom.class, + StructureOceanMonumentPieces.DoubleXRoom::new, "OMDXR"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleXYRoom.class, + StructureOceanMonumentPieces.DoubleXYRoom::new, "OMDXYR"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleYRoom.class, + StructureOceanMonumentPieces.DoubleYRoom::new, "OMDYR"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleYZRoom.class, + StructureOceanMonumentPieces.DoubleYZRoom::new, "OMDYZR"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.DoubleZRoom.class, + StructureOceanMonumentPieces.DoubleZRoom::new, "OMDZR"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.EntryRoom.class, + StructureOceanMonumentPieces.EntryRoom::new, "OMEntry"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.Penthouse.class, + StructureOceanMonumentPieces.Penthouse::new, "OMPenthouse"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.SimpleRoom.class, + StructureOceanMonumentPieces.SimpleRoom::new, "OMSimple"); + MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.SimpleTopRoom.class, + StructureOceanMonumentPieces.SimpleTopRoom::new, "OMSimpleT"); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java index 2542cb41..794f73c2 100644 --- a/src/game/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java +++ b/src/game/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java @@ -1734,18 +1734,31 @@ public class StructureStrongholdPieces { } public static void registerStrongholdPieces() { - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.ChestCorridor.class, "SHCC"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Corridor.class, "SHFC"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Crossing.class, "SH5C"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.LeftTurn.class, "SHLT"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Library.class, "SHLi"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.PortalRoom.class, "SHPR"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Prison.class, "SHPH"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.RightTurn.class, "SHRT"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.RoomCrossing.class, "SHRC"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Stairs.class, "SHSD"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Stairs2.class, "SHStart"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Straight.class, "SHS"); - MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.StairsStraight.class, "SHSSD"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.ChestCorridor.class, + StructureStrongholdPieces.ChestCorridor::new, "SHCC"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Corridor.class, + StructureStrongholdPieces.Corridor::new, "SHFC"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Crossing.class, + StructureStrongholdPieces.Crossing::new, "SH5C"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.LeftTurn.class, + StructureStrongholdPieces.LeftTurn::new, "SHLT"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Library.class, + StructureStrongholdPieces.Library::new, "SHLi"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.PortalRoom.class, + StructureStrongholdPieces.PortalRoom::new, "SHPR"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Prison.class, + StructureStrongholdPieces.Prison::new, "SHPH"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.RightTurn.class, + StructureStrongholdPieces.RightTurn::new, "SHRT"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.RoomCrossing.class, + StructureStrongholdPieces.RoomCrossing::new, "SHRC"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Stairs.class, + StructureStrongholdPieces.Stairs::new, "SHSD"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Stairs2.class, + StructureStrongholdPieces.Stairs2::new, "SHStart"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.Straight.class, + StructureStrongholdPieces.Straight::new, "SHS"); + MapGenStructureIO.registerStructureComponent(StructureStrongholdPieces.StairsStraight.class, + StructureStrongholdPieces.StairsStraight::new, "SHSSD"); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/gen/structure/StructureVillagePieces.java b/src/game/java/net/minecraft/world/gen/structure/StructureVillagePieces.java index 6f856a16..6eb203d1 100644 --- a/src/game/java/net/minecraft/world/gen/structure/StructureVillagePieces.java +++ b/src/game/java/net/minecraft/world/gen/structure/StructureVillagePieces.java @@ -2039,18 +2039,31 @@ public class StructureVillagePieces { } public static void registerVillagePieces() { - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House1.class, "ViBH"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Field1.class, "ViDF"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Field2.class, "ViF"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Torch.class, "ViL"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Hall.class, "ViPH"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House4Garden.class, "ViSH"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.WoodHut.class, "ViSmH"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Church.class, "ViST"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House2.class, "ViS"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Start.class, "ViStart"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Path.class, "ViSR"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House3.class, "ViTRH"); - MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Well.class, "ViW"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House1.class, + StructureVillagePieces.House1::new, "ViBH"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Field1.class, + StructureVillagePieces.Field1::new, "ViDF"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Field2.class, + StructureVillagePieces.Field2::new, "ViF"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Torch.class, + StructureVillagePieces.Torch::new, "ViL"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Hall.class, + StructureVillagePieces.Hall::new, "ViPH"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House4Garden.class, + StructureVillagePieces.House4Garden::new, "ViSH"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.WoodHut.class, + StructureVillagePieces.WoodHut::new, "ViSmH"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Church.class, + StructureVillagePieces.Church::new, "ViST"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House2.class, + StructureVillagePieces.House2::new, "ViS"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Start.class, + StructureVillagePieces.Start::new, "ViStart"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Path.class, + StructureVillagePieces.Path::new, "ViSR"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House3.class, + StructureVillagePieces.House3::new, "ViTRH"); + MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Well.class, + StructureVillagePieces.Well::new, "ViW"); } } \ No newline at end of file diff --git a/src/game/java/net/minecraft/world/storage/SaveFormatOld.java b/src/game/java/net/minecraft/world/storage/SaveFormatOld.java index 8fb9130b..8e817973 100644 --- a/src/game/java/net/minecraft/world/storage/SaveFormatOld.java +++ b/src/game/java/net/minecraft/world/storage/SaveFormatOld.java @@ -7,6 +7,7 @@ import java.util.List; import com.google.common.collect.Lists; +import net.lax1dude.eaglercraft.v1_8.EagUtils; import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; @@ -110,11 +111,7 @@ public class SaveFormatOld implements ISaveFormat { logger.warn("Unsuccessful in deleting contents."); if (i < 5) { - try { - Thread.sleep(500L); - } catch (InterruptedException var5) { - ; - } + EagUtils.sleep(500); } } diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java index 41e36c91..b41242ab 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java @@ -30,14 +30,11 @@ import paulscode.sound.codecs.CodecWav; */ public class PlatformAudio { - public static interface IAudioCacheLoader { - byte[] loadFile(String filename); - } - protected static class PaulscodeAudioHandle implements IAudioHandle { protected final String sourceName; protected long stall; + protected boolean paused = false; protected PaulscodeAudioHandle(String sourceName) { this.sourceName = sourceName; @@ -47,6 +44,7 @@ public class PlatformAudio { @Override public void end() { sndSystem.stop(sourceName); + paused = false; } @Override @@ -65,10 +63,12 @@ public class PlatformAudio { if (sndSystem.playing(sourceName)) { sndSystem.pause(sourceName); } + paused = true; } else { if (!sndSystem.playing(sourceName)) { sndSystem.play(sourceName); } + paused = false; } } @@ -82,14 +82,16 @@ public class PlatformAudio { this.stall = PlatformRuntime.steadyTimeMillis(); sndSystem.rewind(sourceName); sndSystem.play(sourceName); + paused = false; } @Override public boolean shouldFree() { - return !sndSystem.playing(sourceName) && PlatformRuntime.steadyTimeMillis() - this.stall > 250l; // TODO: I - // hate - // this - // hack + return !paused && !sndSystem.playing(sourceName) && PlatformRuntime.steadyTimeMillis() - this.stall > 250l; // TODO: + // I + // hate + // this + // hack } } diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java index 5bc7e413..d43d2904 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java @@ -70,6 +70,8 @@ import org.lwjgl.glfw.GLFWGamepadState; import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.system.MemoryStack; +import net.lax1dude.eaglercraft.v1_8.Display; + /** * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. * @@ -182,7 +184,6 @@ public class PlatformInput { private static boolean enableRepeatEvents = false; private static int functionKeyModifier = GLFW_KEY_F; - public static boolean lockKeys = false; private static final List keyboardCharList = new LinkedList<>(); @@ -206,6 +207,8 @@ public class PlatformInput { private static int[] lastPos = new int[4]; + private static final long[] syncTimer = new long[1]; + public static boolean contextLost() { return glfwGetWindowAttrib(win, GLFW_ICONIFIED) == GLFW_TRUE; } @@ -570,6 +573,10 @@ public class PlatformInput { return true; } + public static boolean keyboardAreKeysLocked() { + return false; + } + public static void keyboardEnableRepeatEvents(boolean b) { enableRepeatEvents = b; } @@ -924,12 +931,21 @@ public class PlatformInput { } public static void update() { + update(0); + } + + public static void update(int limitFps) { glfwPollEvents(); if (vsync != glfwVSyncState) { glfwSwapInterval(vsync ? 1 : 0); glfwVSyncState = vsync; } glfwSwapBuffers(win); + if (limitFps > 0 && !vsync) { + Display.sync(limitFps, syncTimer); + } else { + syncTimer[0] = 0l; + } } public static boolean wasResized() { diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java index d7aae702..32e4487f 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java @@ -600,12 +600,6 @@ public class PlatformOpenGL { data == null ? 0l : EaglerLWJGLAllocator.getAddress(data)); } - public static final void _wglTexImage2D(int target, int level, int internalFormat, int width, int height, - int border, int format, int type, FloatBuffer data) { - nglTexImage2D(target, level, internalFormat, width, height, border, format, type, - data == null ? 0l : EaglerLWJGLAllocator.getAddress(data)); - } - public static final void _wglTexImage2D(int target, int level, int internalFormat, int width, int height, int border, int format, int type, IntBuffer data) { nglTexImage2D(target, level, internalFormat, width, height, border, format, type, @@ -618,6 +612,12 @@ public class PlatformOpenGL { data == null ? 0l : EaglerLWJGLAllocator.getAddress(data)); } + public static final void _wglTexImage2Df32(int target, int level, int internalFormat, int width, int height, + int border, int format, int type, FloatBuffer data) { + nglTexImage2D(target, level, internalFormat, width, height, border, format, type, + data == null ? 0l : EaglerLWJGLAllocator.getAddress(data)); + } + public static final void _wglTexImage2Du16(int target, int level, int internalFormat, int width, int height, int border, int format, int type, ByteBuffer data) { nglTexImage2D(target, level, internalFormat, width, height, border, format, type, @@ -658,13 +658,13 @@ public class PlatformOpenGL { } public static final void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, FloatBuffer data) { + int format, int type, IntBuffer data) { nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, data == null ? 0l : EaglerLWJGLAllocator.getAddress(data)); } - public static final void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, IntBuffer data) { + public static final void _wglTexSubImage2Df32(int target, int level, int xoffset, int yoffset, int width, + int height, int format, int type, FloatBuffer data) { nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, data == null ? 0l : EaglerLWJGLAllocator.getAddress(data)); } diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java index e9e12ea4..06318c86 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java @@ -666,6 +666,13 @@ public class PlatformRuntime { Thread.currentThread().setName(string); } + public static void sleep(int millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + } + } + public static long steadyTimeMillis() { return System.nanoTime() / 1000000l; } diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java index 56bee96e..d63cb371 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java @@ -149,6 +149,11 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter { return false; } + @Override + public boolean isCheckGLErrors() { + return false; + } + @Override public boolean isCheckRelaysForUpdates() { return false; @@ -156,7 +161,7 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter { @Override public boolean isCheckShaderGLErrors() { - return true; + return false; } @Override diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java index ddc68042..121e8d6a 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java @@ -76,7 +76,7 @@ public class LWJGLEntryPoint { lr.setVisible(true); while (lr.isVisible()) { - EagUtils.sleep(100l); + EagUtils.sleep(100); } lr.dispose(); @@ -93,7 +93,7 @@ public class LWJGLEntryPoint { EagRuntime.create(); - Main.appMain(new String[0]); + Main.appMain(); } diff --git a/src/main/java/com/google/common/base/Platform.java b/src/main/java/com/google/common/base/Platform.java index d13c3dd9..ca1d9465 100644 --- a/src/main/java/com/google/common/base/Platform.java +++ b/src/main/java/com/google/common/base/Platform.java @@ -20,6 +20,8 @@ import java.lang.ref.WeakReference; import com.google.common.annotations.GwtCompatible; +import net.lax1dude.eaglercraft.v1_8.EagRuntime; + /** * Methods factored out so that they can be emulated differently in GWT. * @@ -38,7 +40,7 @@ final class Platform { /** Calls {@link System#nanoTime()}. */ static long systemNanoTime() { - return System.nanoTime(); + return EagRuntime.nanoTime(); } private Platform() { diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java index 26e25258..c71a3c7d 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Display.java @@ -24,6 +24,8 @@ public class Display { private static long lastDPIUpdate = -250l; private static float cacheDPI = 1.0f; + private static final long[] defaultSyncPtr = new long[1]; + public static boolean contextLost() { return PlatformInput.contextLost(); } @@ -94,17 +96,36 @@ public class Display { } public static void sync(int limitFramerate) { + sync(limitFramerate, defaultSyncPtr); + } + + public static boolean sync(int limitFramerate, long[] timerPtr) { boolean limitFPS = limitFramerate > 0 && limitFramerate < 1000; + boolean blocked = false; if (limitFPS) { - long millis = EagRuntime.steadyTimeMillis(); - long frameMillis = (1000l / limitFramerate) - (millis - lastSwap); - if (frameMillis > 0l) { - EagUtils.sleep(frameMillis); + if (timerPtr[0] == 0l) { + timerPtr[0] = EagRuntime.steadyTimeMillis(); + } else { + long millis = EagRuntime.steadyTimeMillis(); + long frameMillis = (1000l / limitFramerate); + long frameTime = millis - timerPtr[0]; + if (frameTime > 2000l || frameTime < 0l) { + frameTime = frameMillis; + timerPtr[0] = millis; + } else { + timerPtr[0] += frameMillis; + } + if (frameTime >= 0l && frameTime < frameMillis) { + EagUtils.sleep(frameMillis - frameTime); + blocked = true; + } } + } else { + timerPtr[0] = 0l; } - lastSwap = EagRuntime.steadyTimeMillis(); + return blocked; } public static void toggleFullscreen() { @@ -115,6 +136,10 @@ public class Display { PlatformInput.update(); } + public static void update(int limitFramerate) { + PlatformInput.update(limitFramerate); + } + public static boolean wasResized() { return PlatformInput.wasResized(); } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java index 980e7653..9bcf82ea 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagUtils.java @@ -5,6 +5,8 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; +import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime; + /** * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved. * @@ -66,11 +68,15 @@ public class EagUtils { return EaglercraftUUID.nameUUIDFromBytes(("EaglercraftXClientOld:" + name).getBytes(StandardCharsets.UTF_8)); } + public static void sleep(int millis) { + PlatformRuntime.sleep(millis); + } + public static void sleep(long millis) { - try { - Thread.sleep(millis); - } catch (InterruptedException ex) { - } + int reduced = (int) millis; + if (reduced != millis) + throw new IllegalArgumentException(); + PlatformRuntime.sleep(reduced); } public static String toASCIIEagler(String str) { diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java index 1021ff30..4760b6ec 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java @@ -5,6 +5,7 @@ import java.util.LinkedList; import java.util.List; import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType; +import net.lax1dude.eaglercraft.v1_8.internal.IAudioCacheLoader; import net.lax1dude.eaglercraft.v1_8.internal.IAudioHandle; import net.lax1dude.eaglercraft.v1_8.internal.IAudioResource; import net.lax1dude.eaglercraft.v1_8.internal.PlatformAudio; @@ -124,7 +125,7 @@ public class EaglercraftSoundManager { private final List activeSounds; private final List queuedSounds; - private final PlatformAudio.IAudioCacheLoader browserResourcePackLoader = filename -> { + private final IAudioCacheLoader browserResourcePackLoader = filename -> { try { return EaglerInputStream.inputStreamToBytesQuiet(Minecraft.getMinecraft().getResourceManager() .getResource(new ResourceLocation(filename)).getInputStream()); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 50bd2e08..40d21f11 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -9,7 +9,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "Starlike Client"; - public static final String projectForkVersion = "0.2.2"; + public static final String projectForkVersion = "0.3.0"; public static final String projectForkVendor = "SpeedSlicer and zumbiepig"; public static final String projectForkURL = ""; @@ -19,7 +19,7 @@ public class EaglercraftVersion { public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.8"; - public static final String projectOriginVersion = "u39"; + public static final String projectOriginVersion = "u40"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace @@ -32,7 +32,7 @@ public class EaglercraftVersion { public static final boolean enableUpdateService = true; public static final String updateBundlePackageName = "dev.zumbiepig.starlikeclient.client"; - public static final int updateBundlePackageVersionInt = 202; // (0.2.1 would be 000201 or just 201) + public static final int updateBundlePackageVersionInt = 300; // (0.2.1 would be 000201 or just 201) public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName; @@ -45,19 +45,20 @@ public class EaglercraftVersion { public static final EaglercraftUUID clientBrandUUID = EagUtils.makeClientBrandUUID(projectForkName); public static final EaglercraftUUID legacyClientUUIDInSharedWorld = EagUtils - .makeClientBrandUUIDLegacy(projectOriginName); + .makeClientBrandUUIDLegacy(projectForkName); // Miscellaneous variables: + // bottom-left public static final String mainMenuStringA = "Minecraft 1.8.8*"; - public static final String mainMenuStringB = projectOriginName + " " + projectOriginRevision + "-" - + projectOriginVersion; + public static final String mainMenuStringB = projectForkName + " " + projectForkVersion; + // bottom-right public static final String mainMenuStringC = null; public static final String mainMenuStringD = "Copyright Mojang AB. Do not distribute!"; - - public static final String mainMenuStringE = " " + projectForkName + " " + projectForkVersion; - public static final String mainMenuStringF = "Made by " + projectForkVendor; - + // below logo + public static final String mainMenuStringE = null; + public static final String mainMenuStringF = null; + // top-left public static final String mainMenuStringG = null; public static final String mainMenuStringH = null; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java index f50e5528..3cf0cf0e 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/Keyboard.java @@ -22,6 +22,10 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput; */ public class Keyboard { + public static boolean areKeysLocked() { + return PlatformInput.keyboardAreKeysLocked(); + } + public static void enableRepeatEvents(boolean b) { PlatformInput.keyboardEnableRepeatEvents(b); } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IAudioCacheLoader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IAudioCacheLoader.java new file mode 100644 index 00000000..1a6fc92e --- /dev/null +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IAudioCacheLoader.java @@ -0,0 +1,23 @@ +package net.lax1dude.eaglercraft.v1_8.internal; + +/** + * Copyright (c) 2024 lax1dude. All Rights Reserved. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ +public interface IAudioCacheLoader { + + byte[] loadFile(String filename); + +} \ No newline at end of file diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java index 59698651..8c696836 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java @@ -70,6 +70,8 @@ public interface IClientConfigAdapter { boolean isAllowVoiceClient(); + boolean isCheckGLErrors(); + boolean isCheckRelaysForUpdates(); boolean isCheckShaderGLErrors(); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java index b0d392d3..db675c49 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IServerQuery.java @@ -3,6 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.internal; import org.json.JSONObject; import net.lax1dude.eaglercraft.v1_8.EagRuntime; +import net.lax1dude.eaglercraft.v1_8.EagUtils; /** * Copyright (c) 2022 lax1dude. All Rights Reserved. @@ -61,10 +62,7 @@ public interface IServerQuery { long start = EagRuntime.steadyTimeMillis(); while (isOpen() && responsesAvailable() <= 0 && (timeout <= 0l || EagRuntime.steadyTimeMillis() - start < timeout)) { - try { - Thread.sleep(0l, 250000); - } catch (InterruptedException e) { - } + EagUtils.sleep(5); } return responsesAvailable() > 0; } @@ -85,10 +83,7 @@ public interface IServerQuery { long start = EagRuntime.steadyTimeMillis(); while (isOpen() && binaryResponsesAvailable() <= 0 && (timeout <= 0l || EagRuntime.steadyTimeMillis() - start < timeout)) { - try { - Thread.sleep(0l, 250000); - } catch (InterruptedException e) { - } + EagUtils.sleep(5); } return binaryResponsesAvailable() > 0; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java index 451cbd2e..440e7c61 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java @@ -280,7 +280,7 @@ public class EaglerDeferredPipeline { GlStateManager.popMatrix(); GlStateManager.matrixMode(GL_MODELVIEW); GlStateManager.popMatrix(); - EagUtils.sleep(10l); + EagUtils.sleep(10); } public static void setLinear() { diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java index b1a8abf9..527a179d 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java @@ -67,7 +67,8 @@ public class GuiScreenImportExportProfile extends GuiScreen { waitingForFile = false; FileChooserResult result = EagRuntime.getFileChooserResult(); if (result != null) { - mc.loadingScreen.eaglerShow(I18n.format("settingsBackup.importing.1"), "settingsBackup.importing.2"); + mc.loadingScreen.eaglerShow(I18n.format("settingsBackup.importing.1"), + I18n.format("settingsBackup.importing.2")); ProfileImporter importer = new ProfileImporter(result.fileData); try { importer.readHeader(); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java index f1b1ed24..eec44a1c 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java @@ -12,6 +12,7 @@ import java.util.Map.Entry; import net.lax1dude.eaglercraft.v1_8.ArrayUtils; import net.lax1dude.eaglercraft.v1_8.EagRuntime; +import net.lax1dude.eaglercraft.v1_8.EagUtils; import net.lax1dude.eaglercraft.v1_8.EaglerInputStream; import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream; import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; @@ -441,10 +442,7 @@ public class ConnectionHandshake { if (client.getState().isClosed()) { return null; } - try { - Thread.sleep(50l); - } catch (InterruptedException e) { - } + EagUtils.sleep(50); if (EagRuntime.steadyTimeMillis() - millis > timeout) { client.close(); return null; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java index 38489de6..1ab4c8cb 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/client/GameProtocolMessageController.java @@ -96,9 +96,11 @@ public class GameProtocolMessageController { pkt = sendQueueV4.remove(0); sendFunction.sendPluginMessage(GamePluginMessageConstants.V4_CHANNEL, pkt); } else { - int i, j, sendCount = 0, totalLen = 0; + int i, j, sendCount, totalLen; PacketBuffer sendBuffer; while (sendQueueV4.size() > 0) { + sendCount = 0; + totalLen = 0; do { i = sendQueueV4.get(sendCount++).readableBytes(); totalLen += GamePacketOutputBuffer.getVarIntSize(i) + i; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java index bb26263f..ae076f9b 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java @@ -65,7 +65,11 @@ public class GuiScreenConnectOption extends GuiScreen { prompt = I18n.format("directConnect.prompt"); buttonList.clear(); buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 - 60 + 90, - I18n.format("directConnect.serverJoin"))); + I18n.format("directConnect.serverJoin")) { + { + enabled = false; + } + }); buttonList.add(new GuiButton(2, this.width / 2 - 100, this.height / 4 - 60 + 115, I18n.format("directConnect.lanWorld"))); buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 - 60 + 155, I18n.format("gui.cancel"))); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java index 8b95779f..8c3c34e9 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java @@ -116,7 +116,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { connectState = SENT_DESCRIPTION; continue mainLoop; } - EagUtils.sleep(20l); + EagUtils.sleep(20); } while (EagRuntime.steadyTimeMillis() - lm < 5000l); // no description was sent @@ -154,7 +154,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { return new LANClientNetworkManager(displayCode, displayRelay); } - EagUtils.sleep(20l); + EagUtils.sleep(20); } while (EagRuntime.steadyTimeMillis() - lm < 5000l); // no channel was opened @@ -194,7 +194,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { connectState = SENT_ICE_CANDIDATE; continue mainLoop; } - EagUtils.sleep(20l); + EagUtils.sleep(20); } while (EagRuntime.steadyTimeMillis() - lm < 5000l); // no ice candidates were sent @@ -232,7 +232,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { return null; } } - EagUtils.sleep(20l); + EagUtils.sleep(20); } return null; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java index 44c07e14..7ba33319 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientPeer.java @@ -77,7 +77,7 @@ class LANClientPeer { disconnect(); return; } - EagUtils.sleep(20l); + EagUtils.sleep(20); } while (EagRuntime.steadyTimeMillis() - millis < 5000l); logger.error("Getting server description for '{}' timed out!", clientId); disconnect(); @@ -117,7 +117,7 @@ class LANClientPeer { disconnect(); return; } - EagUtils.sleep(20l); + EagUtils.sleep(20); } while (EagRuntime.steadyTimeMillis() - millis < 5000l); logger.error("Getting server ICE candidates for '{}' timed out!", clientId); disconnect(); @@ -149,7 +149,7 @@ class LANClientPeer { disconnect(); return; } - EagUtils.sleep(20l); + EagUtils.sleep(20); } while (EagRuntime.steadyTimeMillis() - millis < 5000l); logger.error("Getting server description for '{}' timed out!", clientId); disconnect(); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java index 480a82bf..7af70b44 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANServerController.java @@ -138,7 +138,7 @@ public class LANServerController { return null; } } - EagUtils.sleep(50l); + EagUtils.sleep(50); } while (EagRuntime.steadyTimeMillis() - millis < 1000l); logger.info("Relay [{}] relay provide ICE servers timeout", sock.getURI()); closeLAN(); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java index ecf6a319..fe3cd76f 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java @@ -107,10 +107,10 @@ public class RelayManager { return null; } } - EagUtils.sleep(20l); + EagUtils.sleep(20); } } - EagUtils.sleep(20l); + EagUtils.sleep(20); } logger.error("Relay [{}] connection failed!", relay.address); Throwable t; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java index 758dc60e..0d00e1ab 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayServer.java @@ -113,7 +113,7 @@ public class RelayServer { public void pingBlocking() { ping(); while (getPing() < 0l) { - EagUtils.sleep(250l); + EagUtils.sleep(250); update(); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java index 0e722fbc..d8bd288f 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java @@ -423,7 +423,7 @@ public class EaglerIntegratedServerWorker { } } else { if (!singleThreadMode) { - EagUtils.sleep(50l); + EagUtils.sleep(50); } } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWaring.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWarning.java similarity index 97% rename from src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWaring.java rename to src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWarning.java index 629371a6..4168ced0 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWaring.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/webview/GuiScreenPhishingWarning.java @@ -24,7 +24,7 @@ import net.minecraft.util.ResourceLocation; * POSSIBILITY OF SUCH DAMAGE. * */ -public class GuiScreenPhishingWaring extends GuiScreen { +public class GuiScreenPhishingWarning extends GuiScreen { public static boolean hasShownMessage = false; @@ -34,7 +34,7 @@ public class GuiScreenPhishingWaring extends GuiScreen { private boolean mouseOverCheck; private boolean hasCheckedBox; - public GuiScreenPhishingWaring(GuiScreen cont) { + public GuiScreenPhishingWarning(GuiScreen cont) { this.cont = cont; } diff --git a/src/main/java/net/starlikeclient/StarlikeSettings.java b/src/main/java/net/starlikeclient/StarlikeSettings.java new file mode 100644 index 00000000..b88ee74a --- /dev/null +++ b/src/main/java/net/starlikeclient/StarlikeSettings.java @@ -0,0 +1,17 @@ +package net.starlikeclient; + +public class StarlikeSettings { + /* + * Block id limit + * + * Default value: 4096 + */ + public static final int blockIdLimit = 4096; + + /* + * Controls the maximum number of blocks changed when using `/clone` or `/fill`. + * + * Default value: 32768 + */ + public static final int commandModificationBlockLimit = 65536; +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/blocks/BlockCustomDrop.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockCustomDrop.java new file mode 100644 index 00000000..7a8745d1 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockCustomDrop.java @@ -0,0 +1,35 @@ +package net.starlikeclient.minecraft.blocks; + +import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; + +public class BlockCustomDrop extends Block { + private Item itemDropped; + + public BlockCustomDrop(Block blockDropped, Material materialIn) { + this(Item.getItemFromBlock(blockDropped), materialIn); + } + + public BlockCustomDrop(Block blockDropped, Material parMaterial, MapColor parMapColor) { + this(Item.getItemFromBlock(blockDropped), parMaterial, parMapColor); + } + + public BlockCustomDrop(Item itemDropped, Material materialIn) { + super(materialIn); + this.itemDropped = itemDropped; + } + + public BlockCustomDrop(Item itemDropped, Material parMaterial, MapColor parMapColor) { + super(parMaterial, parMapColor); + this.itemDropped = itemDropped; + } + + @Override + public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { + return this.itemDropped; + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/blocks/BlockCustomDropOre.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockCustomDropOre.java new file mode 100644 index 00000000..9850e6d6 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockCustomDropOre.java @@ -0,0 +1,74 @@ +package net.starlikeclient.minecraft.blocks; + +import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.util.BlockPos; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class BlockCustomDropOre extends BlockCustomDrop { + public BlockCustomDropOre(Block blockDropped) { + super(blockDropped, Material.rock); + } + + public BlockCustomDropOre(Block blockDropped, MapColor parMapColor) { + super(blockDropped, Material.rock, parMapColor); + } + + public BlockCustomDropOre(Item itemDropped) { + super(itemDropped, Material.rock); + } + + public BlockCustomDropOre(Item itemDropped, MapColor parMapColor) { + super(itemDropped, Material.rock, parMapColor); + } + + // xp dropped + @Override + public void dropBlockAsItemWithChance(World world, BlockPos blockpos, IBlockState iblockstate, float f, int i) { + super.dropBlockAsItemWithChance(world, blockpos, iblockstate, f, i); + if (this.getItemDropped(iblockstate, world.rand, i) != Item.getItemFromBlock(this)) { + int j = 0; + if (this == Blocks.coal_ore) { + j = MathHelper.getRandomIntegerInRange(world.rand, 0, 2); + } else if (this == Blocks.diamond_ore) { + j = MathHelper.getRandomIntegerInRange(world.rand, 3, 7); + } else if (this == Blocks.emerald_ore) { + j = MathHelper.getRandomIntegerInRange(world.rand, 3, 7); + } else if (this == Blocks.lapis_ore) { + j = MathHelper.getRandomIntegerInRange(world.rand, 2, 5); + } else if (this == Blocks.quartz_ore) { + j = MathHelper.getRandomIntegerInRange(world.rand, 2, 5); + } + + this.dropXpOnBlockBreak(world, blockpos, j); + } + } + + // quantity dropped without fortune + @Override + public int quantityDropped(EaglercraftRandom random) { + return this == Blocks.lapis_ore ? 4 + random.nextInt(5) : 1; + } + + // quantity dropped with fortune + @Override + public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { + if (i > 0 && Item.getItemFromBlock(this) != this + .getItemDropped((IBlockState) this.getBlockState().getValidStates().iterator().next(), random, i)) { + int j = random.nextInt(i + 2) - 1; + if (j < 0) { + j = 0; + } + + return this.quantityDropped(random) * (j + 1); + } else { + return this.quantityDropped(random); + } + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/blocks/BlockDeepslate.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockDeepslate.java new file mode 100644 index 00000000..f06dd26b --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockDeepslate.java @@ -0,0 +1,23 @@ +package net.starlikeclient.minecraft.blocks; + +import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; + +public class BlockDeepslate extends Block { + public BlockDeepslate() { + super(Material.rock); + this.setHardness(3.0F); + this.setResistance(10.0F); + this.setStepSound(Block.soundTypePiston); + this.setCreativeTab(CreativeTabs.tabStarlike); + } + + public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { + return this == Blocks.deepslate ? Item.getItemFromBlock(Blocks.cobbled_deepslate) : Item.getItemFromBlock(this); + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/block/BlockFabricator.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockFabricator.java similarity index 58% rename from src/game/java/net/minecraft/block/BlockFabricator.java rename to src/main/java/net/starlikeclient/minecraft/blocks/BlockFabricator.java index a0692d7c..60ad8492 100644 --- a/src/game/java/net/minecraft/block/BlockFabricator.java +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockFabricator.java @@ -1,5 +1,6 @@ -package net.minecraft.block; +package net.starlikeclient.minecraft.blocks; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -7,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ContainerFabricator; import net.minecraft.stats.StatList; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; @@ -15,30 +15,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.world.IInteractionObject; import net.minecraft.world.World; +import net.starlikeclient.minecraft.guis.inventory.ContainerFabricator; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class BlockFabricator extends Block { public static class InterfaceCraftingTable implements IInteractionObject { private final World world; @@ -58,7 +36,7 @@ public class BlockFabricator extends Block { } public String getGuiID() { - return "minecraft:crafting_table"; + return "starlike:fabricator"; } public String getName() { @@ -72,7 +50,7 @@ public class BlockFabricator extends Block { protected BlockFabricator() { super(Material.wood); - this.setCreativeTab(CreativeTabs.tabDecorations); + this.setCreativeTab(CreativeTabs.tabStarlike); } public boolean onBlockActivated(World world, BlockPos blockpos, IBlockState var3, EntityPlayer entityplayer, diff --git a/src/game/java/net/minecraft/block/BlockMosaic.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockMosaic.java similarity index 76% rename from src/game/java/net/minecraft/block/BlockMosaic.java rename to src/main/java/net/starlikeclient/minecraft/blocks/BlockMosaic.java index 3d82dc54..024cf0cf 100644 --- a/src/game/java/net/minecraft/block/BlockMosaic.java +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockMosaic.java @@ -1,7 +1,8 @@ -package net.minecraft.block; +package net.starlikeclient.minecraft.blocks; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -13,29 +14,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class BlockMosaic extends Block { public static enum EnumType implements IStringSerializable { OAK(0, "oak", MapColor.woodColor), SPRUCE(1, "spruce", MapColor.obsidianColor), @@ -93,6 +71,7 @@ public class BlockMosaic extends Block { return this.unlocalizedName; } + @Override public String toString() { return this.name; } @@ -107,9 +86,13 @@ public class BlockMosaic extends Block { public BlockMosaic() { super(Material.wood); this.setDefaultState(this.blockState.getBaseState().withProperty(VARIANT, BlockMosaic.EnumType.OAK)); - this.setCreativeTab(CreativeTabs.tabBlock); + this.setHardness(2.0F); + this.setResistance(5.0F); + this.setStepSound(Block.soundTypeWood); + this.setCreativeTab(CreativeTabs.tabStarlike); } + @Override protected BlockState createBlockState() { return new BlockState(this, new IProperty[] { VARIANT }); } @@ -119,6 +102,7 @@ public class BlockMosaic extends Block { * when the block gets destroyed. It returns the metadata of the dropped item * based on the old metadata of the block. */ + @Override public int damageDropped(IBlockState iblockstate) { return ((BlockMosaic.EnumType) iblockstate.getValue(VARIANT)).getMetadata(); } @@ -126,6 +110,7 @@ public class BlockMosaic extends Block { /** * + Get the MapColor for this Block and the given BlockState */ + @Override public MapColor getMapColor(IBlockState iblockstate) { return ((BlockMosaic.EnumType) iblockstate.getValue(VARIANT)).func_181070_c(); } @@ -133,6 +118,7 @@ public class BlockMosaic extends Block { /** * + Convert the BlockState into the correct metadata value */ + @Override public int getMetaFromState(IBlockState iblockstate) { return ((BlockMosaic.EnumType) iblockstate.getValue(VARIANT)).getMetadata(); } @@ -140,6 +126,7 @@ public class BlockMosaic extends Block { /** * + Convert the given metadata into a BlockState for this Block */ + @Override public IBlockState getStateFromMeta(int i) { return this.getDefaultState().withProperty(VARIANT, BlockMosaic.EnumType.byMetadata(i)); } @@ -148,6 +135,7 @@ public class BlockMosaic extends Block { * + returns a list of blocks with the same ID, but different meta (eg: wood * returns 4 blocks) */ + @Override public void getSubBlocks(Item item, CreativeTabs var2, List list) { BlockMosaic.EnumType[] types = BlockMosaic.EnumType.META_LOOKUP; for (int i = 0; i < types.length; ++i) { diff --git a/src/main/java/net/starlikeclient/minecraft/blocks/BlockSmithing.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockSmithing.java new file mode 100644 index 00000000..16538f70 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockSmithing.java @@ -0,0 +1,26 @@ +package net.starlikeclient.minecraft.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.starlikeclient.minecraft.guis.GuiHelper; + +public class BlockSmithing extends Block { + public BlockSmithing() { + super(Material.wood); + this.setHardness(2.5F); + this.setStepSound(soundTypeWood); + this.setCreativeTab(CreativeTabs.tabStarlike); + } + + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, + EnumFacing side, float hitX, float hitY, float hitZ) { + GuiHelper.openGuiSmithing(worldIn, pos, playerIn); + return true; + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/blocks/BlockSteelGrate.java b/src/main/java/net/starlikeclient/minecraft/blocks/BlockSteelGrate.java new file mode 100644 index 00000000..7fd50546 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/blocks/BlockSteelGrate.java @@ -0,0 +1,27 @@ +package net.starlikeclient.minecraft.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.util.EnumWorldBlockLayer; + +public class BlockSteelGrate extends Block { + public BlockSteelGrate() { + super(Material.iron); + this.setHardness(5.0F); + this.setResistance(10.0F); + this.setStepSound(Block.soundTypeMetal); + this.setLightOpacity(1); + this.setCreativeTab(CreativeTabs.tabStarlike); + } + + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; + } + + @Override + public boolean isOpaqueCube() { + return false; + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/command/CommandGm.java b/src/main/java/net/starlikeclient/minecraft/commands/CommandGm.java similarity index 89% rename from src/game/java/net/minecraft/command/CommandGm.java rename to src/main/java/net/starlikeclient/minecraft/commands/CommandGm.java index 0cf306f8..4b41a494 100644 --- a/src/game/java/net/minecraft/command/CommandGm.java +++ b/src/main/java/net/starlikeclient/minecraft/commands/CommandGm.java @@ -1,5 +1,9 @@ -package net.minecraft.command; +package net.starlikeclient.minecraft.commands; +import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.WorldSettings; diff --git a/src/main/java/net/starlikeclient/minecraft/entities/ai/EntityAIEndCreeperSwell.java b/src/main/java/net/starlikeclient/minecraft/entities/ai/EntityAIEndCreeperSwell.java new file mode 100644 index 00000000..60ebcde8 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/entities/ai/EntityAIEndCreeperSwell.java @@ -0,0 +1,54 @@ +package net.starlikeclient.minecraft.entities.ai; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.ai.EntityAIBase; +import net.starlikeclient.minecraft.entities.entity.EntityEndCreeper; + +public class EntityAIEndCreeperSwell extends EntityAIBase { + EntityEndCreeper swellingCreeper; + EntityLivingBase creeperAttackTarget; + + public EntityAIEndCreeperSwell(EntityEndCreeper entityEndCreeper) { + this.swellingCreeper = entityEndCreeper; + this.setMutexBits(1); + } + + /** + * + Resets the task + */ + public void resetTask() { + this.creeperAttackTarget = null; + } + + /** + * + Returns whether the EntityAIBase should begin execution. + */ + public boolean shouldExecute() { + EntityLivingBase entitylivingbase = this.swellingCreeper.getAttackTarget(); + return this.swellingCreeper.getCreeperState() > 0 + || entitylivingbase != null && this.swellingCreeper.getDistanceSqToEntity(entitylivingbase) < 9.0D; + } + + /** + * + Execute a one shot task or start executing a continuous task + */ + public void startExecuting() { + this.swellingCreeper.getNavigator().clearPathEntity(); + this.creeperAttackTarget = this.swellingCreeper.getAttackTarget(); + } + + /** + * + Updates the task + */ + public void updateTask() { + if (this.creeperAttackTarget == null) { + this.swellingCreeper.setCreeperState(-1); + } else if (this.swellingCreeper.getDistanceSqToEntity(this.creeperAttackTarget) > 49.0D) { + this.swellingCreeper.setCreeperState(-1); + } else if (!this.swellingCreeper.getEntitySenses().canSee(this.creeperAttackTarget)) { + this.swellingCreeper.setCreeperState(-1); + } else { + this.swellingCreeper.setCreeperState(1); + } + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/entity/ai/EntityAINetherCreeperSwell.java b/src/main/java/net/starlikeclient/minecraft/entities/ai/EntityAINetherCreeperSwell.java similarity index 54% rename from src/game/java/net/minecraft/entity/ai/EntityAINetherCreeperSwell.java rename to src/main/java/net/starlikeclient/minecraft/entities/ai/EntityAINetherCreeperSwell.java index 7b5abb75..1f7f5fde 100644 --- a/src/game/java/net/minecraft/entity/ai/EntityAINetherCreeperSwell.java +++ b/src/main/java/net/starlikeclient/minecraft/entities/ai/EntityAINetherCreeperSwell.java @@ -1,31 +1,9 @@ -package net.minecraft.entity.ai; +package net.starlikeclient.minecraft.entities.ai; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityNetherCreeper; +import net.minecraft.entity.ai.EntityAIBase; +import net.starlikeclient.minecraft.entities.entity.EntityNetherCreeper; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class EntityAINetherCreeperSwell extends EntityAIBase { EntityNetherCreeper swellingCreeper; EntityLivingBase creeperAttackTarget; diff --git a/src/main/java/net/starlikeclient/minecraft/entities/entity/EntityEndCreeper.java b/src/main/java/net/starlikeclient/minecraft/entities/entity/EntityEndCreeper.java new file mode 100644 index 00000000..80ad3c31 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/entities/entity/EntityEndCreeper.java @@ -0,0 +1,299 @@ +package net.starlikeclient.minecraft.entities.entity; + +import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; +import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIAvoidEntity; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILookIdle; +import net.minecraft.entity.ai.EntityAINearestAttackableTarget; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAIWander; +import net.minecraft.entity.ai.EntityAIWatchClosest; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.monster.EntityMob; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.passive.EntityOcelot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import net.starlikeclient.minecraft.entities.ai.EntityAIEndCreeperSwell; + +public class EntityEndCreeper extends EntityMob { + private int lastActiveTime; + private int timeSinceIgnited; + private int fuseTime = 30; + /** + * + Explosion radius for this creeper. + */ + private int explosionRadius = 12; + private int field_175494_bm = 0; + + public EntityEndCreeper(World worldIn) { + super(worldIn); + this.tasks.addTask(1, new EntityAISwimming(this)); + this.tasks.addTask(2, new EntityAIEndCreeperSwell(this)); + this.tasks.addTask(3, new EntityAIAvoidEntity(this, EntityOcelot.class, 6.0F, 1.0D, 1.2D)); + this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, false)); + this.tasks.addTask(5, new EntityAIWander(this, 0.8D)); + this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); + this.tasks.addTask(6, new EntityAILookIdle(this)); + this.targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true)); + this.targetTasks.addTask(2, new EntityAIHurtByTarget(this, false, new Class[0])); + } + + protected void applyEntityAttributes() { + super.applyEntityAttributes(); + this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.3D); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(20D); + + } + + public boolean attackEntityAsMob(Entity var1) { + return true; + } + + protected void entityInit() { + super.entityInit(); + this.dataWatcher.addObject(16, Byte.valueOf((byte) -1)); + this.dataWatcher.addObject(17, Byte.valueOf((byte) 0)); + this.dataWatcher.addObject(18, Byte.valueOf((byte) 0)); + } + + /** + * + Creates an explosion as determined by this creeper's power and explosion + * radius. + */ + private void explode() { + if (!this.worldObj.isRemote) { + boolean flag = this.worldObj.getGameRules().getBoolean("mobGriefing"); + float f = this.getPowered() ? 2.0F : 1.0F; + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) this.explosionRadius * f, + flag); + this.setDead(); + } + + } + + public void fall(float f, float f1) { + super.fall(f, f1); + this.timeSinceIgnited = (int) ((float) this.timeSinceIgnited + f * 1.5F); + if (this.timeSinceIgnited > this.fuseTime - 5) { + this.timeSinceIgnited = this.fuseTime - 5; + } + + } + + public void func_175493_co() { + ++this.field_175494_bm; + } + + /** + * + Params: (Float)Render tick. Returns the intensity of the creeper's flash + * when it is ignited. + */ + public float getCreeperFlashIntensity(float parFloat1) { + return ((float) this.lastActiveTime + (float) (this.timeSinceIgnited - this.lastActiveTime) * parFloat1) + / (float) (this.fuseTime - 2); + } + + /** + * + Returns the current state of creeper, -1 is idle, 1 is 'in fuse' + */ + public int getCreeperState() { + return this.dataWatcher.getWatchableObjectByte(16); + } + + /** + * + Returns the sound this mob makes on death. + */ + protected String getDeathSound() { + return "mob.creeper.death"; + } + + protected Item getDropItem() { + return Items.ender_eye; + } + + protected float getEaglerDynamicLightsValueSimple(float partialTicks) { + float f = super.getEaglerDynamicLightsValueSimple(partialTicks); + float ff = getCreeperFlashIntensity(partialTicks); + if ((int) (ff * 10.0F) % 2 != 0) { + f = Math.min(f + 0.5f, 1.15f); + } + return f; + } + + /** + * + Returns the sound this mob makes when it is hurt. + */ + protected String getHurtSound() { + return "mob.creeper.say"; + } + + /** + * + The maximum height from where the entity is alowed to jump (used in + * pathfinder) + */ + public int getMaxFallHeight() { + return this.getAttackTarget() == null ? 3 : 3 + (int) (this.getHealth() - 1.0F); + } + + /** + * + Returns true if the creeper is powered by a lightning bolt. + */ + public boolean getPowered() { + return this.dataWatcher.getWatchableObjectByte(17) == 1; + } + + public boolean hasIgnited() { + return this.dataWatcher.getWatchableObjectByte(18) != 0; + } + + public void ignite() { + this.dataWatcher.updateObject(18, Byte.valueOf((byte) 1)); + } + + /** + * + Called when a player interacts with a mob. e.g. gets milk from a cow, gets + * into the saddle on a pig. + */ + protected boolean interact(EntityPlayer entityplayer) { + ItemStack itemstack = entityplayer.inventory.getCurrentItem(); + if (itemstack != null && itemstack.getItem() == Items.flint_and_steel) { + this.worldObj.playSoundEffect(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.ignite", 1.0F, + this.rand.nextFloat() * 0.4F + 0.8F); + entityplayer.swingItem(); + if (!this.worldObj.isRemote) { + this.ignite(); + itemstack.damageItem(1, entityplayer); + return true; + } + } + + return super.interact(entityplayer); + } + + /** + * + Returns true if the newer Entity AI code should be run + */ + public boolean isAIEnabled() { + return this.field_175494_bm < 1 && this.worldObj.getGameRules().getBoolean("doMobLoot"); + } + + /** + * + Called when the mob's health reaches 0. + */ + public void onDeath(DamageSource damagesource) { + super.onDeath(damagesource); + if (damagesource.getEntity() instanceof EntitySkeleton) { + int i = Item.getIdFromItem(Items.record_13); + int j = Item.getIdFromItem(Items.record_wait); + int k = i + this.rand.nextInt(j - i + 1); + this.dropItem(Item.getItemById(k), 1); + } else if (damagesource.getEntity() instanceof EntityEndCreeper && damagesource.getEntity() != this + && ((EntityEndCreeper) damagesource.getEntity()).getPowered() + && ((EntityEndCreeper) damagesource.getEntity()).isAIEnabled()) { + ((EntityEndCreeper) damagesource.getEntity()).func_175493_co(); + this.entityDropItem(new ItemStack(Items.skull, 1, 4), 0.0F); + } + + } + + /** + * + Called when a lightning bolt hits the entity. + */ + public void onStruckByLightning(EntityLightningBolt entitylightningbolt) { + super.onStruckByLightning(entitylightningbolt); + this.dataWatcher.updateObject(17, Byte.valueOf((byte) 1)); + } + + /** + * + Called to update the entity's position/logic. + */ + public void onUpdate() { + if (this.isEntityAlive()) { + this.lastActiveTime = this.timeSinceIgnited; + if (this.hasIgnited()) { + this.setCreeperState(1); + } + + int i = this.getCreeperState(); + if (i > 0 && this.timeSinceIgnited == 0) { + this.playSound("creeper.primed", 1.0F, 0.5F); + } + + this.timeSinceIgnited += i; + if (this.timeSinceIgnited < 0) { + this.timeSinceIgnited = 0; + } + + if (this.timeSinceIgnited >= this.fuseTime) { + this.timeSinceIgnited = this.fuseTime; + this.explode(); + } + } + + super.onUpdate(); + } + + /** + * + (abstract) Protected helper method to read subclass entity data from NBT. + */ + public void readEntityFromNBT(NBTTagCompound nbttagcompound) { + super.readEntityFromNBT(nbttagcompound); + this.dataWatcher.updateObject(17, Byte.valueOf((byte) (nbttagcompound.getBoolean("powered") ? 1 : 0))); + if (nbttagcompound.hasKey("Fuse", 99)) { + this.fuseTime = nbttagcompound.getShort("Fuse"); + } + + if (nbttagcompound.hasKey("ExplosionRadius", 99)) { + this.explosionRadius = nbttagcompound.getByte("ExplosionRadius"); + } + + if (nbttagcompound.getBoolean("ignited")) { + this.ignite(); + } + + } + + protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, + double renderY, double renderZ, float partialTicks, boolean isInFrustum) { + super.renderDynamicLightsEaglerAt(entityX, entityY, entityZ, renderX, renderY, renderZ, partialTicks, + isInFrustum); + float ff = getCreeperFlashIntensity(partialTicks); + if ((int) (ff * 10.0F) % 2 != 0) { + float dynamicLightMag = 7.0f; + DynamicLightManager.renderDynamicLight("entity_" + getEntityId() + "_creeper_flash", entityX, entityY + 1.0, + entityZ, dynamicLightMag, dynamicLightMag * 0.7792f, dynamicLightMag * 0.618f, false); + DeferredStateManager.setEmissionConstant(1.0f); + } + } + + /** + * + Sets the state of creeper, -1 to idle and 1 to be 'in fuse' + */ + public void setCreeperState(int state) { + this.dataWatcher.updateObject(16, Byte.valueOf((byte) state)); + } + + /** + * + (abstract) Protected helper method to write subclass entity data to NBT. + */ + public void writeEntityToNBT(NBTTagCompound nbttagcompound) { + super.writeEntityToNBT(nbttagcompound); + if (this.dataWatcher.getWatchableObjectByte(17) == 1) { + nbttagcompound.setBoolean("powered", true); + } + + nbttagcompound.setShort("Fuse", (short) this.fuseTime); + nbttagcompound.setByte("ExplosionRadius", (byte) this.explosionRadius); + nbttagcompound.setBoolean("ignited", this.hasIgnited()); + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/entity/monster/EntityNetherCreeper.java b/src/main/java/net/starlikeclient/minecraft/entities/entity/EntityNetherCreeper.java similarity index 88% rename from src/game/java/net/minecraft/entity/monster/EntityNetherCreeper.java rename to src/main/java/net/starlikeclient/minecraft/entities/entity/EntityNetherCreeper.java index 4bdfe90a..5ff16d07 100644 --- a/src/game/java/net/minecraft/entity/monster/EntityNetherCreeper.java +++ b/src/main/java/net/starlikeclient/minecraft/entities/entity/EntityNetherCreeper.java @@ -1,4 +1,4 @@ -package net.minecraft.entity.monster; +package net.starlikeclient.minecraft.entities.entity; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; @@ -9,11 +9,13 @@ import net.minecraft.entity.ai.EntityAIAvoidEntity; import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAILookIdle; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; -import net.minecraft.entity.ai.EntityAINetherCreeperSwell; import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.monster.EntityMob; +import net.minecraft.entity.monster.EntityPigZombie; +import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -21,30 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import net.starlikeclient.minecraft.entities.ai.EntityAINetherCreeperSwell; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class EntityNetherCreeper extends EntityMob { private int lastActiveTime; private int timeSinceIgnited; @@ -52,7 +32,7 @@ public class EntityNetherCreeper extends EntityMob { /** * + Explosion radius for this creeper. */ - private int explosionRadius = 5; + private int explosionRadius = 8; private int field_175494_bm = 0; public EntityNetherCreeper(World worldIn) { diff --git a/src/main/java/net/starlikeclient/minecraft/entities/layers/LayerEndCreeperCharge.java b/src/main/java/net/starlikeclient/minecraft/entities/layers/LayerEndCreeperCharge.java new file mode 100644 index 00000000..ccface96 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/entities/layers/LayerEndCreeperCharge.java @@ -0,0 +1,114 @@ +package net.starlikeclient.minecraft.entities.layers; + +import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_MODELVIEW; +import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_ONE; +import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_TEXTURE; +import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_ZERO; + +import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; +import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; +import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ShadersRenderPassFuture; +import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; +import net.minecraft.util.ResourceLocation; +import net.starlikeclient.minecraft.entities.entity.EntityEndCreeper; +import net.starlikeclient.minecraft.entities.model.ModelEndCreeper; +import net.starlikeclient.minecraft.entities.render.RenderEndCreeper; + +public class LayerEndCreeperCharge implements LayerRenderer { + private static final ResourceLocation LIGHTNING_TEXTURE = new ResourceLocation( + "textures/entity/EndCreeper/EndCreeper_armor.png"); + private final RenderEndCreeper EndCreeperRenderer; + private final ModelEndCreeper EndCreeperModel = new ModelEndCreeper(2.0F); + + public LayerEndCreeperCharge(RenderEndCreeper EndCreeperRendererIn) { + this.EndCreeperRenderer = EndCreeperRendererIn; + } + + public void doRenderLayer(EntityEndCreeper entityEndCreeper, float f, float f1, float f2, float f3, float f4, + float f5, float f6) { + if (entityEndCreeper.getPowered()) { + if (DeferredStateManager.isInDeferredPass()) { + if (DeferredStateManager.forwardCallbackHandler != null + && !DeferredStateManager.isEnableShadowRender()) { + final Matrix4f mat = new Matrix4f(GlStateManager.getModelViewReference()); + DeferredStateManager.forwardCallbackHandler.push(new ShadersRenderPassFuture(entityEndCreeper) { + @Override + public void draw(PassType pass) { + if (pass == PassType.MAIN) { + DeferredStateManager.reportForwardRenderObjectPosition2(x, y, z); + } + boolean flag = entityEndCreeper.isInvisible(); + DeferredStateManager.setDefaultMaterialConstants(); + DeferredStateManager.setRoughnessConstant(0.3f); + DeferredStateManager.setMetalnessConstant(0.1f); + DeferredStateManager.setEmissionConstant(0.9f); + EntityRenderer.disableLightmapStatic(); + GlStateManager.tryBlendFuncSeparate(GL_ONE, GL_ONE, GL_ZERO, GL_ZERO); + GlStateManager.color(0.5F, 0.5F, 0.5F, 1.0F); + if (flag) { + GlStateManager.depthMask(false); + } + GlStateManager.pushMatrix(); + GlStateManager.loadMatrix(mat); + GlStateManager.disableCull(); + GlStateManager.matrixMode(GL_TEXTURE); + GlStateManager.pushMatrix(); + GlStateManager.loadIdentity(); + float f7 = (float) entityEndCreeper.ticksExisted + f2; + GlStateManager.translate(f7 * 0.01F, f7 * 0.01F, 0.0F); + GlStateManager.matrixMode(GL_MODELVIEW); + LayerEndCreeperCharge.this.EndCreeperRenderer.bindTexture(LIGHTNING_TEXTURE); + LayerEndCreeperCharge.this.EndCreeperModel + .setModelAttributes(LayerEndCreeperCharge.this.EndCreeperRenderer.getMainModel()); + LayerEndCreeperCharge.this.EndCreeperModel.setLivingAnimations(entityEndCreeper, f, f1, f1); + LayerEndCreeperCharge.this.EndCreeperModel.render(entityEndCreeper, f, f1, f3, f4, f5, f6); + GlStateManager.matrixMode(GL_TEXTURE); + GlStateManager.popMatrix(); + GlStateManager.matrixMode(GL_MODELVIEW); + GlStateManager.popMatrix(); + if (flag) { + GlStateManager.depthMask(true); + } + GlStateManager.enableCull(); + DeferredStateManager.setDefaultMaterialConstants(); + DeferredStateManager.setHDRTranslucentPassBlendFunc(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + } + }); + } + return; + } + boolean flag = entityEndCreeper.isInvisible(); + if (flag) { + GlStateManager.depthMask(false); + } + this.EndCreeperRenderer.bindTexture(LIGHTNING_TEXTURE); + GlStateManager.matrixMode(GL_TEXTURE); + GlStateManager.loadIdentity(); + float f7 = (float) entityEndCreeper.ticksExisted + f2; + GlStateManager.translate(f7 * 0.01F, f7 * 0.01F, 0.0F); + GlStateManager.matrixMode(GL_MODELVIEW); + GlStateManager.enableBlend(); + float f8 = 0.5F; + GlStateManager.color(f8, f8, f8, 1.0F); + GlStateManager.disableLighting(); + GlStateManager.blendFunc(GL_ONE, GL_ONE); + this.EndCreeperModel.setModelAttributes(this.EndCreeperRenderer.getMainModel()); + this.EndCreeperModel.render(entityEndCreeper, f, f1, f3, f4, f5, f6); + GlStateManager.matrixMode(GL_TEXTURE); + GlStateManager.loadIdentity(); + GlStateManager.matrixMode(GL_MODELVIEW); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + if (flag) { + GlStateManager.depthMask(true); + } + } + } + + public boolean shouldCombineTextures() { + return false; + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/renderer/entity/layers/LayerNetherCreeperCharge.java b/src/main/java/net/starlikeclient/minecraft/entities/layers/LayerNetherCreeperCharge.java similarity index 77% rename from src/game/java/net/minecraft/client/renderer/entity/layers/LayerNetherCreeperCharge.java rename to src/main/java/net/starlikeclient/minecraft/entities/layers/LayerNetherCreeperCharge.java index 4a3e7c5d..58ebfb3e 100644 --- a/src/game/java/net/minecraft/client/renderer/entity/layers/LayerNetherCreeperCharge.java +++ b/src/main/java/net/starlikeclient/minecraft/entities/layers/LayerNetherCreeperCharge.java @@ -1,4 +1,4 @@ -package net.minecraft.client.renderer.entity.layers; +package net.starlikeclient.minecraft.entities.layers; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_MODELVIEW; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_ONE; @@ -9,35 +9,13 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ShadersRenderPassFuture; import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; -import net.minecraft.client.model.ModelNetherCreeper; import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.entity.RenderNetherCreeper; -import net.minecraft.entity.monster.EntityNetherCreeper; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.util.ResourceLocation; +import net.starlikeclient.minecraft.entities.entity.EntityNetherCreeper; +import net.starlikeclient.minecraft.entities.model.ModelNetherCreeper; +import net.starlikeclient.minecraft.entities.render.RenderNetherCreeper; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class LayerNetherCreeperCharge implements LayerRenderer { private static final ResourceLocation LIGHTNING_TEXTURE = new ResourceLocation( "textures/entity/nethercreeper/creeper_armor.png"); diff --git a/src/main/java/net/starlikeclient/minecraft/entities/model/ModelEndCreeper.java b/src/main/java/net/starlikeclient/minecraft/entities/model/ModelEndCreeper.java new file mode 100644 index 00000000..6db3073b --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/entities/model/ModelEndCreeper.java @@ -0,0 +1,73 @@ +package net.starlikeclient.minecraft.entities.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.util.MathHelper; + +public class ModelEndCreeper extends ModelBase { + public ModelRenderer head; + public ModelRenderer creeperArmor; + public ModelRenderer body; + public ModelRenderer leg1; + public ModelRenderer leg2; + public ModelRenderer leg3; + public ModelRenderer leg4; + + public ModelEndCreeper() { + this(0.0F); + } + + public ModelEndCreeper(float parFloat1) { + byte b0 = 6; + this.head = new ModelRenderer(this, 0, 0); + this.head.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, parFloat1); + this.head.setRotationPoint(0.0F, (float) b0, 0.0F); + this.creeperArmor = new ModelRenderer(this, 32, 0); + this.creeperArmor.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, parFloat1 + 0.5F); + this.creeperArmor.setRotationPoint(0.0F, (float) b0, 0.0F); + this.body = new ModelRenderer(this, 16, 16); + this.body.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, parFloat1); + this.body.setRotationPoint(0.0F, (float) b0, 0.0F); + this.leg1 = new ModelRenderer(this, 0, 16); + this.leg1.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, parFloat1); + this.leg1.setRotationPoint(-2.0F, (float) (12 + b0), 4.0F); + this.leg2 = new ModelRenderer(this, 0, 16); + this.leg2.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, parFloat1); + this.leg2.setRotationPoint(2.0F, (float) (12 + b0), 4.0F); + this.leg3 = new ModelRenderer(this, 0, 16); + this.leg3.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, parFloat1); + this.leg3.setRotationPoint(-2.0F, (float) (12 + b0), -4.0F); + this.leg4 = new ModelRenderer(this, 0, 16); + this.leg4.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, parFloat1); + this.leg4.setRotationPoint(2.0F, (float) (12 + b0), -4.0F); + } + + /** + * + Sets the models various rotation angles then renders the model. + */ + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.head.render(f5); + this.body.render(f5); + this.leg1.render(f5); + this.leg2.render(f5); + this.leg3.render(f5); + this.leg4.render(f5); + } + + /** + * + Sets the model's various rotation angles. For bipeds, par1 and par2 are + * used for animating the movement of arms and legs, where par1 represents the + * time(so that arms and legs swing back and forth) and par2 represents how + * "far" arms and legs can swing at most. + */ + public void setRotationAngles(float f, float f1, float var3, float f2, float f3, float var6, Entity var7) { + this.head.rotateAngleY = f2 / 57.295776F; + this.head.rotateAngleX = f3 / 57.295776F; + this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; + this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; + this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; + this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/model/ModelNetherCreeper.java b/src/main/java/net/starlikeclient/minecraft/entities/model/ModelNetherCreeper.java similarity index 70% rename from src/game/java/net/minecraft/client/model/ModelNetherCreeper.java rename to src/main/java/net/starlikeclient/minecraft/entities/model/ModelNetherCreeper.java index b3e490ce..c8a532a9 100644 --- a/src/game/java/net/minecraft/client/model/ModelNetherCreeper.java +++ b/src/main/java/net/starlikeclient/minecraft/entities/model/ModelNetherCreeper.java @@ -1,31 +1,10 @@ -package net.minecraft.client.model; +package net.starlikeclient.minecraft.entities.model; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class ModelNetherCreeper extends ModelBase { public ModelRenderer head; public ModelRenderer creeperArmor; @@ -62,7 +41,6 @@ public class ModelNetherCreeper extends ModelBase { this.leg4 = new ModelRenderer(this, 0, 16); this.leg4.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, parFloat1); this.leg4.setRotationPoint(2.0F, (float) (12 + b0), -4.0F); - } /** diff --git a/src/main/java/net/starlikeclient/minecraft/entities/render/RenderEndCreeper.java b/src/main/java/net/starlikeclient/minecraft/entities/render/RenderEndCreeper.java new file mode 100644 index 00000000..602b1694 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/entities/render/RenderEndCreeper.java @@ -0,0 +1,71 @@ +package net.starlikeclient.minecraft.entities.render; + +import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; +import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.starlikeclient.minecraft.entities.entity.EntityEndCreeper; +import net.starlikeclient.minecraft.entities.layers.LayerEndCreeperCharge; +import net.starlikeclient.minecraft.entities.model.ModelEndCreeper; + +public class RenderEndCreeper extends RenderLiving { + private static final ResourceLocation EndCreeperTextures = new ResourceLocation( + "starlike:textures/entity/endcreeper/creeper.png"); + + public RenderEndCreeper(RenderManager renderManagerIn) { + super(renderManagerIn, new ModelEndCreeper(), 0.5F); + this.addLayer(new LayerEndCreeperCharge(this)); + } + + public void doRender(EntityEndCreeper entityEndCreeper, double d0, double d1, double d2, float f, float f1) { + float ff = entityEndCreeper.getCreeperFlashIntensity(f); + if ((int) (ff * 10.0F) % 2 != 0) { + DeferredStateManager.setEmissionConstant(1.0f); + } + try { + super.doRender(entityEndCreeper, d0, d1, d2, f, f1); + } finally { + DeferredStateManager.setEmissionConstant(0.0f); + } + } + + /** + * + Returns an ARGB int color back. Args: entityLiving, lightBrightness, + * partialTickTime + */ + protected int getColorMultiplier(EntityEndCreeper entityEndCreeper, float var2, float f) { + float f1 = entityEndCreeper.getCreeperFlashIntensity(f); + if ((int) (f1 * 10.0F) % 2 == 0) { + return 0; + } else { + int i = (int) (f1 * 0.2F * 255.0F); + i = MathHelper.clamp_int(i, 0, 255); + return i << 24 | 16777215; + } + } + + /** + * + Returns the location of an entity's texture. Doesn't seem to be called + * unless you call Render.bindEntityTexture. + */ + protected ResourceLocation getEntityTexture(EntityEndCreeper var1) { + return EndCreeperTextures; + } + + /** + * + Allows the render to do any OpenGL state modifications necessary before the + * model is rendered. Args: entityLiving, partialTickTime + */ + protected void preRenderCallback(EntityEndCreeper entityEndCreeper, float f) { + float f1 = entityEndCreeper.getCreeperFlashIntensity(f); + float f2 = 1.0F + MathHelper.sin(f1 * 100.0F) * f1 * 0.01F; + f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); + f1 = f1 * f1; + f1 = f1 * f1; + float f3 = (1.0F + f1 * 0.4F) * f2; + float f4 = (1.0F + f1 * 0.1F) / f2; + GlStateManager.scale(f3, f4, f3); + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/renderer/entity/RenderNetherCreeper.java b/src/main/java/net/starlikeclient/minecraft/entities/render/RenderNetherCreeper.java similarity index 61% rename from src/game/java/net/minecraft/client/renderer/entity/RenderNetherCreeper.java rename to src/main/java/net/starlikeclient/minecraft/entities/render/RenderNetherCreeper.java index 068ee42d..d48338a0 100644 --- a/src/game/java/net/minecraft/client/renderer/entity/RenderNetherCreeper.java +++ b/src/main/java/net/starlikeclient/minecraft/entities/render/RenderNetherCreeper.java @@ -1,36 +1,15 @@ -package net.minecraft.client.renderer.entity; +package net.starlikeclient.minecraft.entities.render; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; -import net.minecraft.client.model.ModelNetherCreeper; -import net.minecraft.client.renderer.entity.layers.LayerNetherCreeperCharge; -import net.minecraft.entity.monster.EntityNetherCreeper; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.starlikeclient.minecraft.entities.entity.EntityNetherCreeper; +import net.starlikeclient.minecraft.entities.layers.LayerNetherCreeperCharge; +import net.starlikeclient.minecraft.entities.model.ModelNetherCreeper; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class RenderNetherCreeper extends RenderLiving { private static final ResourceLocation creeperTextures = new ResourceLocation( "starlike:textures/entity/nethercreeper/creeper.png"); diff --git a/src/main/java/net/starlikeclient/minecraft/guis/GuiHelper.java b/src/main/java/net/starlikeclient/minecraft/guis/GuiHelper.java new file mode 100644 index 00000000..322d5390 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/guis/GuiHelper.java @@ -0,0 +1,28 @@ +package net.starlikeclient.minecraft.guis; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.play.server.S2DPacketOpenWindow; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; +import net.starlikeclient.minecraft.guis.gui.GuiSmithing; +import net.starlikeclient.minecraft.guis.inventory.ContainerSmithing; + +public class GuiHelper { + public static void openGuiSmithing(World world, BlockPos pos, EntityPlayer player) { + if (world.isRemote) { + Minecraft.getMinecraft() + .displayGuiScreen(new GuiSmithing(new ContainerSmithing(player.inventory, world, pos))); + } else { + EntityPlayerMP playerMP = (EntityPlayerMP) player; + playerMP.getNextWindowId(); + playerMP.playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(playerMP.currentWindowId, + "starlike:smithing_table", new ChatComponentText("Smithing Table"))); + playerMP.openContainer = new ContainerSmithing(player.inventory, world, pos); + playerMP.openContainer.windowId = playerMP.currentWindowId; + playerMP.openContainer.onCraftGuiOpened(playerMP); + } + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/item/crafting/FabricatorManager.java b/src/main/java/net/starlikeclient/minecraft/guis/crafting/FabricatorManager.java similarity index 81% rename from src/game/java/net/minecraft/item/crafting/FabricatorManager.java rename to src/main/java/net/starlikeclient/minecraft/guis/crafting/FabricatorManager.java index 67b9aaa1..3be51d2e 100644 --- a/src/game/java/net/minecraft/item/crafting/FabricatorManager.java +++ b/src/main/java/net/starlikeclient/minecraft/guis/crafting/FabricatorManager.java @@ -1,4 +1,4 @@ -package net.minecraft.item.crafting; +package net.starlikeclient.minecraft.guis.crafting; import java.util.ArrayList; import java.util.Collections; @@ -16,31 +16,11 @@ import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class FabricatorManager { private static FabricatorManager instance; diff --git a/src/main/java/net/starlikeclient/minecraft/guis/crafting/SmithingManager.java b/src/main/java/net/starlikeclient/minecraft/guis/crafting/SmithingManager.java new file mode 100644 index 00000000..83223f5b --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/guis/crafting/SmithingManager.java @@ -0,0 +1,36 @@ +package net.starlikeclient.minecraft.guis.crafting; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.starlikeclient.minecraft.init.RecipesStarlike; + +public class SmithingManager { + private static final SmithingManager instance = new SmithingManager(); + + public static SmithingManager getInstance() { + return instance; + } + + private final Map smithingList = new HashMap<>(); + + public SmithingManager() { + RecipesStarlike.addSmithingRecipes(this); + } + + public void addSmithingRecipe(ItemStack input, ItemStack output) { + if (getSmithingResult(input) != null) + return; + smithingList.put(input, output); + } + + public ItemStack getSmithingResult(ItemStack input) { + for (Map.Entry entry : smithingList.entrySet()) { + if (input.getItem() == entry.getKey().getItem()) { + return entry.getValue(); + } + } + return null; + } +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/client/gui/inventory/GuiFabricator.java b/src/main/java/net/starlikeclient/minecraft/guis/gui/GuiFabricator.java similarity index 56% rename from src/game/java/net/minecraft/client/gui/inventory/GuiFabricator.java rename to src/main/java/net/starlikeclient/minecraft/guis/gui/GuiFabricator.java index 6c4780c5..ea915493 100644 --- a/src/game/java/net/minecraft/client/gui/inventory/GuiFabricator.java +++ b/src/main/java/net/starlikeclient/minecraft/guis/gui/GuiFabricator.java @@ -1,6 +1,7 @@ -package net.minecraft.client.gui.inventory; +package net.starlikeclient.minecraft.guis.gui; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; @@ -8,32 +9,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class GuiFabricator extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - "textures/gui/container/fabricator.png"); + "starlike:textures/gui/container/fabricator.png"); public GuiFabricator(InventoryPlayer playerInv, World worldIn) { this(playerInv, worldIn, BlockPos.ORIGIN); diff --git a/src/main/java/net/starlikeclient/minecraft/guis/gui/GuiSmithing.java b/src/main/java/net/starlikeclient/minecraft/guis/gui/GuiSmithing.java new file mode 100644 index 00000000..7c8396a2 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/guis/gui/GuiSmithing.java @@ -0,0 +1,42 @@ +package net.starlikeclient.minecraft.guis.gui; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.util.ResourceLocation; +import net.starlikeclient.minecraft.guis.inventory.ContainerSmithing; + +public class GuiSmithing extends GuiContainer { + private static final ResourceLocation SMITHING_GUI_TEXTURE = new ResourceLocation( + "starlike:textures/gui/container/smithing.png"); + private final ContainerSmithing containerSmithing; + + public GuiSmithing(Container container) { + super(container); + this.containerSmithing = (ContainerSmithing) container; + this.xSize = 176; + this.ySize = 166; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + this.mc.getTextureManager().bindTexture(SMITHING_GUI_TEXTURE); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + + // x arrow if invalid craft + if (this.containerSmithing.isCraftingValid() == false && (this.containerSmithing.getSlot(0).getHasStack() + || this.containerSmithing.getSlot(1).getHasStack())) { + this.drawTexturedModalRect(k + 99, l + 45, 176, 0, 28, 21); // Arrow with an "X" at (176, 0) to (203, 20) + } + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + String title = "Upgrade Gear"; + int titleX = ((this.xSize - this.fontRendererObj.getStringWidth(title)) / 2) + 7; + int titleY = 18; + this.fontRendererObj.drawString(title, titleX, titleY, 0xFFFFFF); + } + +} \ No newline at end of file diff --git a/src/game/java/net/minecraft/inventory/ContainerFabricator.java b/src/main/java/net/starlikeclient/minecraft/guis/inventory/ContainerFabricator.java similarity index 74% rename from src/game/java/net/minecraft/inventory/ContainerFabricator.java rename to src/main/java/net/starlikeclient/minecraft/guis/inventory/ContainerFabricator.java index 062cd2b0..6a9abc04 100644 --- a/src/game/java/net/minecraft/inventory/ContainerFabricator.java +++ b/src/main/java/net/starlikeclient/minecraft/guis/inventory/ContainerFabricator.java @@ -1,36 +1,19 @@ -package net.minecraft.inventory; +package net.starlikeclient.minecraft.guis.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FabricatorManager; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.starlikeclient.minecraft.guis.crafting.FabricatorManager; -/** - * + This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source - * code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" Mod - * Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights - * Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ public class ContainerFabricator extends Container { /** * + The crafting matrix inventory (4x4). diff --git a/src/main/java/net/starlikeclient/minecraft/guis/inventory/ContainerSmithing.java b/src/main/java/net/starlikeclient/minecraft/guis/inventory/ContainerSmithing.java new file mode 100644 index 00000000..7741591e --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/guis/inventory/ContainerSmithing.java @@ -0,0 +1,189 @@ +package net.starlikeclient.minecraft.guis.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryBasic; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import net.starlikeclient.minecraft.guis.crafting.SmithingManager; +import net.minecraft.network.play.server.S30PacketWindowItems; + +public class ContainerSmithing extends Container { + private final IInventory smithingInventory; + + public ContainerSmithing(InventoryPlayer playerInventory, World worldIn, BlockPos posIn) { + this.smithingInventory = new InventoryBasic("Smithing", true, 3); + + this.addSlotToContainer(new Slot(smithingInventory, 0, 27, 47) { + @Override + public void onSlotChanged() { + super.onSlotChanged(); + ContainerSmithing.this.onCraftMatrixChanged(smithingInventory); + } + }); + + this.addSlotToContainer(new Slot(smithingInventory, 1, 76, 47) { + @Override + public boolean isItemValid(ItemStack itemstack) { + return itemstack.getItem() == Items.netherite_ingot; + } + + @Override + public void onSlotChanged() { + super.onSlotChanged(); + ContainerSmithing.this.onCraftMatrixChanged(smithingInventory); + } + }); + + this.addSlotToContainer(new Slot(smithingInventory, 2, 134, 47) { + @Override + public boolean isItemValid(ItemStack itemstack) { + return false; + } + + @Override + public void onPickupFromSlot(EntityPlayer playerIn, ItemStack itemstack) { + super.onPickupFromSlot(playerIn, itemstack); + ContainerSmithing.this.decrementInputItems(); + } + }); + + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + this.addSlotToContainer(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (int k = 0; k < 9; ++k) { + this.addSlotToContainer(new Slot(playerInventory, k, 8 + k * 18, 142)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer playerIn) { + return true; + } + + private void decrementInputItems() { + ItemStack input = this.smithingInventory.getStackInSlot(0); + ItemStack material = this.smithingInventory.getStackInSlot(1); + + if (input != null) { + input.stackSize--; + if (input.stackSize <= 0) { + this.smithingInventory.setInventorySlotContents(0, null); + } + } + + if (material != null) { + material.stackSize--; + if (material.stackSize <= 0) { + this.smithingInventory.setInventorySlotContents(1, null); + } + } + } + + public boolean isCraftingValid() { + ItemStack input = this.smithingInventory.getStackInSlot(0); + ItemStack material = this.smithingInventory.getStackInSlot(1); + + if (input != null && material != null) { + return SmithingManager.getInstance().getSmithingResult(input) != null; + } + return false; + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) { + super.onContainerClosed(entityplayer); + if (!entityplayer.worldObj.isRemote) { + for (int i = 0; i < 2; ++i) { + ItemStack itemstack = this.smithingInventory.removeStackFromSlot(i); + if (itemstack != null) { + if (!entityplayer.inventory.addItemStackToInventory(itemstack)) { + entityplayer.dropPlayerItemWithRandomChoice(itemstack, false); + } + } + } + ((EntityPlayerMP) entityplayer).playerNetServerHandler.sendPacket(new S30PacketWindowItems(entityplayer.inventoryContainer.windowId, entityplayer.inventoryContainer.getInventory())); + } + } + + @Override + public void onCraftMatrixChanged(IInventory inventoryIn) { + super.onCraftMatrixChanged(inventoryIn); + this.updateCraftingResult(); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityplayer, int i) { + ItemStack itemstack = null; + Slot slot = (Slot) this.inventorySlots.get(i); + if (slot != null && slot.getHasStack()) { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + if ((i != 0 && i != 1) && ((itemstack1.getItem() == Items.netherite_ingot) + || (SmithingManager.getInstance().getSmithingResult(itemstack1) != null))) { + if (itemstack1.getItem() == Items.netherite_ingot) { + if (!this.mergeItemStack(itemstack1, 1, 2, false)) { + return null; + } + } else if (!this.mergeItemStack(itemstack1, 0, 1, false)) { + return null; + } + } else if (i >= 3 && i < 30) { + if (!this.mergeItemStack(itemstack1, 30, 39, false)) { + return null; + } + } else if (i >= 30 && i < 39) { + if (!this.mergeItemStack(itemstack1, 3, 30, false)) { + return null; + } + } else if (!this.mergeItemStack(itemstack1, 3, 39, false)) { + return null; + } + + if (itemstack1.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + if (itemstack1.stackSize == itemstack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityplayer, itemstack1); + } + + return itemstack; + } + + private void updateCraftingResult() { + ItemStack input = this.smithingInventory.getStackInSlot(0); + ItemStack material = this.smithingInventory.getStackInSlot(1); + + if (input != null && material != null && material.getItem() == Items.netherite_ingot) { + ItemStack result = SmithingManager.getInstance().getSmithingResult(input); + if (result != null) { + result.stackSize = 1; + result.setItemDamage(input.getItemDamage()); + if (input.hasTagCompound()) { + result.setTagCompound((NBTTagCompound) input.getTagCompound().copy()); + } + this.smithingInventory.setInventorySlotContents(2, result); + } else { + this.smithingInventory.setInventorySlotContents(2, null); + } + } else { + this.smithingInventory.setInventorySlotContents(2, null); + } + } +} diff --git a/src/main/java/net/starlikeclient/minecraft/init/CommandsStarlike.java b/src/main/java/net/starlikeclient/minecraft/init/CommandsStarlike.java new file mode 100644 index 00000000..0a7494b1 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/init/CommandsStarlike.java @@ -0,0 +1,13 @@ +package net.starlikeclient.minecraft.init; + +import net.minecraft.command.ServerCommandManager; +import net.starlikeclient.minecraft.commands.CommandGm; + +public class CommandsStarlike { + public static void registerCommands(ServerCommandManager e) { + e.registerCommand(new CommandGm(0)); + e.registerCommand(new CommandGm(1)); + e.registerCommand(new CommandGm(2)); + e.registerCommand(new CommandGm(3)); + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/init/EntitiesStarlike.java b/src/main/java/net/starlikeclient/minecraft/init/EntitiesStarlike.java new file mode 100644 index 00000000..e47e3893 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/init/EntitiesStarlike.java @@ -0,0 +1,32 @@ +package net.starlikeclient.minecraft.init; + +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.EntityList; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.BiomeGenEnd; +import net.minecraft.world.biome.BiomeGenHell; +import net.starlikeclient.minecraft.entities.entity.EntityEndCreeper; +import net.starlikeclient.minecraft.entities.entity.EntityNetherCreeper; +import net.starlikeclient.minecraft.entities.render.RenderEndCreeper; +import net.starlikeclient.minecraft.entities.render.RenderNetherCreeper; + +public class EntitiesStarlike { + public static void configEndEntities(BiomeGenEnd e) { + e.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityEndCreeper.class, 7, 3, 3)); + } + + public static void configNetherEntities(BiomeGenHell e) { + e.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityNetherCreeper.class, 100, 4, 1)); + } + + public static void registerEntities() { + EntityList.addMapping(EntityNetherCreeper.class, EntityNetherCreeper::new, "NetherCreeper", 201, 0xFFCC0000, + 0xFFFFA500); + EntityList.addMapping(EntityEndCreeper.class, EntityEndCreeper::new, "EndCreeper", 202, 0xFF6A0DAD, 0xFF000000); + } + + public static void renderEntities(RenderManager e) { + e.entityRenderMap.put(EntityNetherCreeper.class, new RenderNetherCreeper(e)); + e.entityRenderMap.put(EntityEndCreeper.class, new RenderEndCreeper(e)); + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/init/ItemsStarlike.java b/src/main/java/net/starlikeclient/minecraft/init/ItemsStarlike.java new file mode 100644 index 00000000..b2120b33 --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/init/ItemsStarlike.java @@ -0,0 +1,1186 @@ +package net.starlikeclient.minecraft.init; + +import com.google.common.base.Function; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockOre; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemMultiTexture; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.starlikeclient.minecraft.blocks.BlockDeepslate; +import net.starlikeclient.minecraft.blocks.BlockMosaic; +import net.starlikeclient.minecraft.blocks.BlockSmithing; +import net.starlikeclient.minecraft.blocks.BlockSteelGrate; +import net.starlikeclient.minecraft.items.ItemChisel; + +public class ItemsStarlike { + private static void blockBootstrapStates() { + BlockMosaic.bootstrapStates(); + } + + public static void registerBlocks() { + blockBootstrapStates(); + Block.registerBlock(512, (String) "starlike:deepslate", (new BlockDeepslate()).setUnlocalizedName("deepslate")); + Block.registerBlock(513, (String) "starlike:cobbled_deepslate", + (new Block(Material.rock)).setHardness(3.5F).setResistance(10.0F).setStepSound(Block.soundTypePiston) + .setUnlocalizedName("cobbled_deepslate").setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(514, (String) "starlike:steel_block", + (new Block(Material.iron, MapColor.ironColor)).setHardness(5.0F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("steel_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(515, (String) "starlike:steel_grate", + (new BlockSteelGrate()).setUnlocalizedName("steel_grate")); + Block.registerBlock(516, (String) "starlike:platinum_ore", + (new BlockOre()).setHardness(50.0F).setResistance(250.0F).setStepSound(Block.soundTypePiston) + .setUnlocalizedName("platinum_ore").setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(517, (String) "starlike:platinum_block", + (new Block(Material.iron, MapColor.ironColor)).setHardness(15.0F).setResistance(30.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("platinum_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(518, (String) "starlike:titanium_ore", + (new BlockOre()).setHardness(100.0F).setResistance(500.0F).setStepSound(Block.soundTypePiston) + .setUnlocalizedName("titanium_ore").setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(519, (String) "starlike:titanium_block", + (new Block(Material.iron, MapColor.ironColor)).setHardness(25.0F).setResistance(50.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("titanium_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(520, (String) "starlike:uranium_ore", + (new BlockOre()).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypePiston) + .setUnlocalizedName("uranium_ore").setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(521, (String) "starlike:uranium_block", + (new Block(Material.iron, MapColor.greenColor)).setHardness(40.0F).setResistance(80.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("uranium_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(522, (String) "starlike:mosaic", (new BlockMosaic()).setUnlocalizedName("mosaic")); + Block.registerBlock(523, (String) "starlike:dragonite_block", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(60.0F).setResistance(120.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("dragonite_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(684, (String) "starlike:ancient_debris", + (new Block(Material.iron, MapColor.blackColor)).setHardness(30.0F).setResistance(2000.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("ancient_debris") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(685, (String) "starlike:netherite_block", + (new Block(Material.iron, MapColor.blackColor)).setHardness(50.0F).setResistance(2000.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("netherite_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(686, (String) "starlike:smithing_table", + (new BlockSmithing()).setUnlocalizedName("smithing_table")); + /* + * e.registerBlock(686, (String) "starlike:fabricator", (new + * BlockFabricator()).setHardness(5.0F).setResistance(10.0F).setStepSound(Block. + * soundTypePiston) + * .setUnlocalizedName("fabricator").setCreativeTab(CreativeTabs.tabStarlike)); + */ + +//autogenerateequals + Block.registerBlock(683, "starlike:tuff_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("tuff_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(682, "starlike:soul_stone_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("soul_stone_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(681, "starlike:soul_stone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("soul_stone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(680, "starlike:smooth_basalt", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("smooth_basalt") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(679, "starlike:limestone_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("limestone_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(678, "starlike:limestone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("limestone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(677, "starlike:cobbled_soul_stone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cobbled_soul_stone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(676, "starlike:chiseled_warped_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_warped_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(675, "starlike:chiseled_spruce_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_spruce_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(674, "starlike:chiseled_oak_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_oak_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(673, "starlike:chiseled_mangrove_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_mangrove_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(672, "starlike:chiseled_jungle_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_jungle_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(671, "starlike:chiseled_dark_oak_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_dark_oak_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(670, "starlike:chiseled_crimson_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_crimson_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(669, "starlike:chiseled_cherry_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_cherry_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(668, "starlike:chiseled_birch_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_birch_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(667, "starlike:chiseled_bamboo_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_bamboo_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(666, "starlike:chiseled_acacia_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("chiseled_acacia_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(665, "starlike:calcite_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("calcite_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(664, "starlike:calcite", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("calcite") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(663, "starlike:andesite_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("andesite_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(660, "starlike:polished_blackstone_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("polished_blackstone_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(659, "starlike:polished_blackstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("polished_blackstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(658, "starlike:gilded_blackstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("gilded_blackstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(657, "starlike:cracked_polished_blackstone_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cracked_polished_blackstone_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(656, "starlike:cracked_blackstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cracked_blackstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(655, "starlike:chiseled_polished_blackstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("chiseled_polished_blackstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(654, "starlike:blackstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("blackstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(653, "starlike:tuff_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("tuff_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(652, "starlike:tuff", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("tuff") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(651, "starlike:polished_tuff", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("polished_tuff") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(650, "starlike:chiseled_tuff_top", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("chiseled_tuff_top") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(649, "starlike:chiseled_tuff_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("chiseled_tuff_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(648, "starlike:chiseled_tuff", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("chiseled_tuff") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(647, "starlike:polished_granite_brick", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("polished_granite_brick") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(646, "starlike:polished_diorite_brick", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("polished_diorite_brick") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(645, "starlike:polished_andesite_brick", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("polished_andesite_brick") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(644, "starlike:cobbled_granite", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cobbled_granite") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(643, "starlike:cobbled_diorite", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cobbled_diorite") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(642, "starlike:cobbled_andesite", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cobbled_andesite") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(641, "starlike:ornate_sandstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("ornate_sandstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(640, "starlike:ornate_red_sandstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("ornate_red_sandstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(639, "starlike:decorated_sandstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("decorated_sandstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(638, "starlike:decorated_red_sandstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("decorated_red_sandstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(637, "starlike:yellow_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("yellow_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(636, "starlike:white_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("white_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(635, "starlike:red_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("red_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(634, "starlike:purple_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("purple_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(633, "starlike:pink_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("pink_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(632, "starlike:orange_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("orange_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(631, "starlike:magenta_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("magenta_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(630, "starlike:lime_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("lime_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(629, "starlike:light_gray_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("light_gray_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(628, "starlike:light_blue_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("light_blue_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(627, "starlike:green_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("green_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(626, "starlike:gray_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("gray_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(625, "starlike:cyan_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("cyan_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(624, "starlike:brown_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("brown_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(623, "starlike:blue_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("blue_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(622, "starlike:black_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(0.5f).setResistance(10.0f) + .setStepSound(Block.soundTypeWood).setUnlocalizedName("black_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(621, "starlike:yellow_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("yellow_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(620, "starlike:yellow_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("yellow_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(619, "starlike:yellow_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("yellow_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(618, "starlike:white_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("white_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(617, "starlike:white_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("white_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(616, "starlike:white_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("white_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(615, "starlike:terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(614, "starlike:red_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("red_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(613, "starlike:red_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("red_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(612, "starlike:red_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("red_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(611, "starlike:purple_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("purple_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(610, "starlike:purple_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("purple_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(609, "starlike:purple_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("purple_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(608, "starlike:pink_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("pink_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(607, "starlike:pink_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("pink_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(606, "starlike:pink_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("pink_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(605, "starlike:packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(604, "starlike:orange_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("orange_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(603, "starlike:orange_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("orange_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(602, "starlike:orange_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("orange_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(601, "starlike:magenta_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("magenta_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(600, "starlike:magenta_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("magenta_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(599, "starlike:magenta_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("magenta_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(598, "starlike:lime_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("lime_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(597, "starlike:lime_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("lime_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(596, "starlike:lime_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("lime_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(595, "starlike:light_gray_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("light_gray_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(594, "starlike:light_gray_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("light_gray_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(593, "starlike:light_gray_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("light_gray_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(592, "starlike:light_blue_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("light_blue_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(591, "starlike:light_blue_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("light_blue_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(590, "starlike:light_blue_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("light_blue_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(589, "starlike:green_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("green_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(588, "starlike:green_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("green_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(587, "starlike:green_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("green_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(586, "starlike:gray_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("gray_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(585, "starlike:gray_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("gray_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(584, "starlike:gray_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("gray_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(583, "starlike:cyan_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cyan_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(582, "starlike:cyan_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cyan_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(581, "starlike:cyan_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("cyan_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(580, "starlike:brown_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("brown_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(579, "starlike:brown_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("brown_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(578, "starlike:brown_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("brown_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(577, "starlike:blue_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("blue_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(576, "starlike:blue_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("blue_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(575, "starlike:blue_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("blue_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(574, "starlike:black_terracotta_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("black_terracotta_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(573, "starlike:black_packed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("black_packed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(572, "starlike:black_glazed_terracotta", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("black_glazed_terracotta") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(571, "starlike:zombie_chiseled_stone_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("zombie_chiseled_stone_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(570, "starlike:skeleton_chiseled_red_sandstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("skeleton_chiseled_red_sandstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(569, "starlike:head_chiseled_deepslate", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("head_chiseled_deepslate") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(568, "starlike:ghast_chiseled_quartz_block", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("ghast_chiseled_quartz_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(567, "starlike:creeper_chiseled_sandstone", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5f).setResistance(10.0f) + .setStepSound(Block.soundTypePiston).setUnlocalizedName("creeper_chiseled_sandstone") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(547, "starlike:stone_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("stone_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(546, "starlike:gold_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("gold_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(545, "starlike:diorite_tiles", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("diorite_tiles") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(544, "starlike:deep_ocean_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("deep_ocean_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(543, "starlike:decorated_stripped_spruce_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_stripped_spruce_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(542, "starlike:decorated_stripped_oak_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_stripped_oak_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(541, "starlike:decorated_stripped_jungle_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_stripped_jungle_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(540, "starlike:decorated_stripped_dark_oak_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_stripped_dark_oak_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(539, "starlike:decorated_stripped_birch_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_stripped_birch_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(538, "starlike:decorated_stripped_acacia_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_stripped_acacia_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(537, "starlike:decorated_spruce_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_spruce_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(536, "starlike:decorated_spruce_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_spruce_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(535, "starlike:decorated_oak_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_oak_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(534, "starlike:decorated_oak_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_oak_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(533, "starlike:decorated_jungle_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_jungle_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(532, "starlike:decorated_jungle_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_jungle_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(531, "starlike:decorated_dark_oak_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_dark_oak_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(530, "starlike:decorated_dark_oak_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_dark_oak_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(529, "starlike:decorated_birch_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_birch_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(528, "starlike:decorated_birch_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_birch_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(527, "starlike:decorated_acacia_planks", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_acacia_planks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(526, "starlike:decorated_acacia_log", + (new Block(Material.wood, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("decorated_acacia_log") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(525, "starlike:chiseled_deep_ocean_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("chiseled_deep_ocean_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(524, "starlike:andesite_bricks", + (new Block(Material.rock, MapColor.purpleColor)).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("andesite_bricks") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(566, "starlike:weathered_cut_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("weathered_cut_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(565, "starlike:weathered_copper_grate", + (new BlockSteelGrate()).setHardness(5f).setResistance(10.0f).setStepSound(Block.soundTypeMetal) + .setUnlocalizedName("weathered_copper_grate").setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(564, "starlike:weathered_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("weathered_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(563, "starlike:weathered_chiseled_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("weathered_chiseled_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(562, "starlike:raw_copper_block", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("raw_copper_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(561, "starlike:oxidized_cut_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("oxidized_cut_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(560, "starlike:oxidized_copper_grate", + (new BlockSteelGrate()).setHardness(5f).setResistance(10.0f).setStepSound(Block.soundTypeMetal) + .setUnlocalizedName("oxidized_copper_grate").setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(559, "starlike:oxidized_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("oxidized_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(558, "starlike:oxidized_chiseled_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("oxidized_chiseled_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(557, "starlike:exposed_cut_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("exposed_cut_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(556, "starlike:exposed_copper_grate", + (new BlockSteelGrate().setHardness(5f).setResistance(10.0f).setStepSound(Block.soundTypeMetal) + .setUnlocalizedName("exposed_copper_grate").setCreativeTab(CreativeTabs.tabStarlike))); + Block.registerBlock(555, "starlike:exposed_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("exposed_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(554, "starlike:exposed_chiseled_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("exposed_chiseled_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(553, "starlike:deepslate_copper_ore", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("deepslate_copper_ore") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(552, "starlike:cut_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("cut_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(551, "starlike:copper_ore", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("copper_ore") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(550, "starlike:copper_grate", + (new BlockSteelGrate().setHardness(5f).setResistance(10.0f).setStepSound(Block.soundTypeMetal) + .setUnlocalizedName("copper_grate").setCreativeTab(CreativeTabs.tabStarlike))); + Block.registerBlock(549, "starlike:copper_block", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("copper_block") + .setCreativeTab(CreativeTabs.tabStarlike)); + Block.registerBlock(548, "starlike:chiseled_copper", + (new Block(Material.iron, MapColor.purpleColor)).setHardness(5f).setResistance(10.0f) + .setStepSound(Block.soundTypeMetal).setUnlocalizedName("chiseled_copper") + .setCreativeTab(CreativeTabs.tabStarlike)); + } + + public static void registerItems() { + Item.registerItemBlock(Blocks.deepslate); + Item.registerItemBlock(Blocks.cobbled_deepslate); + Item.registerItemBlock(Blocks.steel_block); + Item.registerItemBlock(Blocks.steel_grate); + Item.registerItemBlock(Blocks.platinum_ore); + Item.registerItemBlock(Blocks.platinum_block); + Item.registerItemBlock(Blocks.titanium_ore); + Item.registerItemBlock(Blocks.titanium_block); + Item.registerItemBlock(Blocks.uranium_ore); + Item.registerItemBlock(Blocks.uranium_block); + Item.registerItemBlock(Blocks.mosaic, + (new ItemMultiTexture(Blocks.mosaic, Blocks.mosaic, new Function() { + public String apply(ItemStack itemstack) { + return BlockMosaic.EnumType.byMetadata(itemstack.getMetadata()).getUnlocalizedName(); + } + })).setUnlocalizedName("mosaic")); + Item.registerItemBlock(Blocks.dragonite_block); + Item.registerItemBlock(Blocks.ancient_debris); + Item.registerItemBlock(Blocks.netherite_block); + Item.registerItemBlock(Blocks.smithing_table); + // Item.registerItemBlock(Blocks.fabricator); + + Item.registerItem(1024, (String) "starlike:steel", + (new Item()).setUnlocalizedName("steel").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1025, (String) "starlike:platinum_ingot", + (new Item()).setUnlocalizedName("platinum_ingot").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1026, (String) "starlike:platinum_sword", (new ItemSword(Item.ToolMaterial.PLATINUM)) + .setUnlocalizedName("platinum_sword").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1027, (String) "starlike:platinum_pickaxe", (new ItemPickaxe(Item.ToolMaterial.PLATINUM)) + .setUnlocalizedName("platinum_pickaxe").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1028, (String) "starlike:platinum_shovel", (new ItemSpade(Item.ToolMaterial.PLATINUM)) + .setUnlocalizedName("platinum_shovel").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1029, (String) "starlike:platinum_axe", (new ItemAxe(Item.ToolMaterial.PLATINUM)) + .setUnlocalizedName("platinum_axe").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1030, (String) "starlike:platinum_hoe", (new ItemHoe(Item.ToolMaterial.PLATINUM)) + .setUnlocalizedName("platinum_hoe").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1031, (String) "starlike:platinum_helmet", + (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 6, 0)).setUnlocalizedName("platinum_helmet") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1032, (String) "starlike:platinum_chestplate", + (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 6, 1)).setUnlocalizedName("platinum_chestplate") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1033, (String) "starlike:platinum_leggings", + (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 6, 2)).setUnlocalizedName("platinum_leggings") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1034, (String) "starlike:platinum_boots", + (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 6, 3)).setUnlocalizedName("platinum_boots") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1035, (String) "starlike:titanium_ingot", + (new Item()).setUnlocalizedName("titanium_ingot").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1036, (String) "starlike:uranium_crystal", + (new Item()).setUnlocalizedName("uranium_crystal").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1037, (String) "starlike:uranium_rod", + (new Item()).setUnlocalizedName("uranium_rod").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1038, (String) "starlike:platinum_drill", (new ItemPickaxe(Item.ToolMaterial.PLATINUM_DRILL)) + .setUnlocalizedName("platinum_drill").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1039, (String) "starlike:titanium_drill", (new ItemPickaxe(Item.ToolMaterial.TITANIUM_DRILL)) + .setUnlocalizedName("titanium_drill").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1040, (String) "starlike:dragonite", + (new Item()).setUnlocalizedName("dragonite").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1041, (String) "starlike:copper_ingot", + (new Item()).setUnlocalizedName("copper_ingot").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1042, (String) "starlike:netherite_scrap", + (new Item()).setUnlocalizedName("netherite_scrap").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1043, (String) "starlike:netherite_ingot", + (new Item()).setUnlocalizedName("netherite_ingot").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1044, (String) "starlike:netherite_sword", (new ItemSword(Item.ToolMaterial.NETHERITE)) + .setUnlocalizedName("netherite_sword").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1045, (String) "starlike:netherite_shovel", (new ItemSpade(Item.ToolMaterial.NETHERITE)) + .setUnlocalizedName("netherite_shovel").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1046, (String) "starlike:netherite_pickaxe", (new ItemPickaxe(Item.ToolMaterial.NETHERITE)) + .setUnlocalizedName("netherite_pickaxe").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1047, (String) "starlike:netherite_axe", (new ItemAxe(Item.ToolMaterial.NETHERITE)) + .setUnlocalizedName("netherite_axe").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1048, (String) "starlike:netherite_hoe", (new ItemHoe(Item.ToolMaterial.NETHERITE)) + .setUnlocalizedName("netherite_hoe").setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1049, (String) "starlike:netherite_helmet", + (new ItemArmor(ItemArmor.ArmorMaterial.NETHERITE, 5, 0)).setUnlocalizedName("netherite_helmet") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1050, (String) "starlike:netherite_chestplate", + (new ItemArmor(ItemArmor.ArmorMaterial.NETHERITE, 5, 1)).setUnlocalizedName("netherite_chestplate") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1051, (String) "starlike:netherite_leggings", + (new ItemArmor(ItemArmor.ArmorMaterial.NETHERITE, 5, 2)).setUnlocalizedName("netherite_leggings") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1052, (String) "starlike:netherite_boots", + (new ItemArmor(ItemArmor.ArmorMaterial.NETHERITE, 5, 3)).setUnlocalizedName("netherite_boots") + .setCreativeTab(CreativeTabs.tabStarlike)); + Item.registerItem(1053, (String) "starlike:chisel", (new ItemChisel()).setUnlocalizedName("chisel")); + +//autogenerateregisterblock + Item.registerItemBlock(Blocks.tuff_tiles); + Item.registerItemBlock(Blocks.soul_stone_tiles); + Item.registerItemBlock(Blocks.soul_stone); + Item.registerItemBlock(Blocks.smooth_basalt); + Item.registerItemBlock(Blocks.limestone_tiles); + Item.registerItemBlock(Blocks.limestone); + Item.registerItemBlock(Blocks.cobbled_soul_stone); + Item.registerItemBlock(Blocks.chiseled_warped_planks); + Item.registerItemBlock(Blocks.chiseled_spruce_planks); + Item.registerItemBlock(Blocks.chiseled_oak_planks); + Item.registerItemBlock(Blocks.chiseled_mangrove_planks); + Item.registerItemBlock(Blocks.chiseled_jungle_planks); + Item.registerItemBlock(Blocks.chiseled_dark_oak_planks); + Item.registerItemBlock(Blocks.chiseled_crimson_planks); + Item.registerItemBlock(Blocks.chiseled_cherry_planks); + Item.registerItemBlock(Blocks.chiseled_birch_planks); + Item.registerItemBlock(Blocks.chiseled_bamboo_planks); + Item.registerItemBlock(Blocks.chiseled_acacia_planks); + Item.registerItemBlock(Blocks.calcite_tiles); + Item.registerItemBlock(Blocks.calcite); + Item.registerItemBlock(Blocks.andesite_tiles); + Item.registerItemBlock(Blocks.polished_blackstone_bricks); + Item.registerItemBlock(Blocks.polished_blackstone); + Item.registerItemBlock(Blocks.gilded_blackstone); + Item.registerItemBlock(Blocks.cracked_polished_blackstone_bricks); + Item.registerItemBlock(Blocks.cracked_blackstone); + Item.registerItemBlock(Blocks.chiseled_polished_blackstone); + Item.registerItemBlock(Blocks.blackstone); + Item.registerItemBlock(Blocks.tuff_bricks); + Item.registerItemBlock(Blocks.tuff); + Item.registerItemBlock(Blocks.polished_tuff); + Item.registerItemBlock(Blocks.chiseled_tuff_top); + Item.registerItemBlock(Blocks.chiseled_tuff_bricks); + Item.registerItemBlock(Blocks.chiseled_tuff); + Item.registerItemBlock(Blocks.polished_granite_brick); + Item.registerItemBlock(Blocks.polished_diorite_brick); + Item.registerItemBlock(Blocks.polished_andesite_brick); + Item.registerItemBlock(Blocks.cobbled_granite); + Item.registerItemBlock(Blocks.cobbled_diorite); + Item.registerItemBlock(Blocks.cobbled_andesite); + Item.registerItemBlock(Blocks.ornate_sandstone); + Item.registerItemBlock(Blocks.ornate_red_sandstone); + Item.registerItemBlock(Blocks.decorated_sandstone); + Item.registerItemBlock(Blocks.decorated_red_sandstone); + Item.registerItemBlock(Blocks.yellow_planks); + Item.registerItemBlock(Blocks.white_planks); + Item.registerItemBlock(Blocks.red_planks); + Item.registerItemBlock(Blocks.purple_planks); + Item.registerItemBlock(Blocks.pink_planks); + Item.registerItemBlock(Blocks.orange_planks); + Item.registerItemBlock(Blocks.magenta_planks); + Item.registerItemBlock(Blocks.lime_planks); + Item.registerItemBlock(Blocks.light_gray_planks); + Item.registerItemBlock(Blocks.light_blue_planks); + Item.registerItemBlock(Blocks.green_planks); + Item.registerItemBlock(Blocks.gray_planks); + Item.registerItemBlock(Blocks.cyan_planks); + Item.registerItemBlock(Blocks.brown_planks); + Item.registerItemBlock(Blocks.blue_planks); + Item.registerItemBlock(Blocks.black_planks); + Item.registerItemBlock(Blocks.yellow_terracotta_bricks); + Item.registerItemBlock(Blocks.yellow_packed_terracotta); + Item.registerItemBlock(Blocks.yellow_glazed_terracotta); + Item.registerItemBlock(Blocks.white_terracotta_bricks); + Item.registerItemBlock(Blocks.white_packed_terracotta); + Item.registerItemBlock(Blocks.white_glazed_terracotta); + Item.registerItemBlock(Blocks.terracotta_bricks); + Item.registerItemBlock(Blocks.red_terracotta_bricks); + Item.registerItemBlock(Blocks.red_packed_terracotta); + Item.registerItemBlock(Blocks.red_glazed_terracotta); + Item.registerItemBlock(Blocks.purple_terracotta_bricks); + Item.registerItemBlock(Blocks.purple_packed_terracotta); + Item.registerItemBlock(Blocks.purple_glazed_terracotta); + Item.registerItemBlock(Blocks.pink_terracotta_bricks); + Item.registerItemBlock(Blocks.pink_packed_terracotta); + Item.registerItemBlock(Blocks.pink_glazed_terracotta); + Item.registerItemBlock(Blocks.packed_terracotta); + Item.registerItemBlock(Blocks.orange_terracotta_bricks); + Item.registerItemBlock(Blocks.orange_packed_terracotta); + Item.registerItemBlock(Blocks.orange_glazed_terracotta); + Item.registerItemBlock(Blocks.magenta_terracotta_bricks); + Item.registerItemBlock(Blocks.magenta_packed_terracotta); + Item.registerItemBlock(Blocks.magenta_glazed_terracotta); + Item.registerItemBlock(Blocks.lime_terracotta_bricks); + Item.registerItemBlock(Blocks.lime_packed_terracotta); + Item.registerItemBlock(Blocks.lime_glazed_terracotta); + Item.registerItemBlock(Blocks.light_gray_terracotta_bricks); + Item.registerItemBlock(Blocks.light_gray_packed_terracotta); + Item.registerItemBlock(Blocks.light_gray_glazed_terracotta); + Item.registerItemBlock(Blocks.light_blue_terracotta_bricks); + Item.registerItemBlock(Blocks.light_blue_packed_terracotta); + Item.registerItemBlock(Blocks.light_blue_glazed_terracotta); + Item.registerItemBlock(Blocks.green_terracotta_bricks); + Item.registerItemBlock(Blocks.green_packed_terracotta); + Item.registerItemBlock(Blocks.green_glazed_terracotta); + Item.registerItemBlock(Blocks.gray_terracotta_bricks); + Item.registerItemBlock(Blocks.gray_packed_terracotta); + Item.registerItemBlock(Blocks.gray_glazed_terracotta); + Item.registerItemBlock(Blocks.cyan_terracotta_bricks); + Item.registerItemBlock(Blocks.cyan_packed_terracotta); + Item.registerItemBlock(Blocks.cyan_glazed_terracotta); + Item.registerItemBlock(Blocks.brown_terracotta_bricks); + Item.registerItemBlock(Blocks.brown_packed_terracotta); + Item.registerItemBlock(Blocks.brown_glazed_terracotta); + Item.registerItemBlock(Blocks.blue_terracotta_bricks); + Item.registerItemBlock(Blocks.blue_packed_terracotta); + Item.registerItemBlock(Blocks.blue_glazed_terracotta); + Item.registerItemBlock(Blocks.black_terracotta_bricks); + Item.registerItemBlock(Blocks.black_packed_terracotta); + Item.registerItemBlock(Blocks.black_glazed_terracotta); + Item.registerItemBlock(Blocks.zombie_chiseled_stone_bricks); + Item.registerItemBlock(Blocks.skeleton_chiseled_red_sandstone); + Item.registerItemBlock(Blocks.head_chiseled_deepslate); + Item.registerItemBlock(Blocks.ghast_chiseled_quartz_block); + Item.registerItemBlock(Blocks.creeper_chiseled_sandstone); + Item.registerItemBlock(Blocks.weathered_cut_copper); + Item.registerItemBlock(Blocks.weathered_copper_grate); + Item.registerItemBlock(Blocks.weathered_copper); + Item.registerItemBlock(Blocks.weathered_chiseled_copper); + Item.registerItemBlock(Blocks.raw_copper_block); + Item.registerItemBlock(Blocks.oxidized_cut_copper); + Item.registerItemBlock(Blocks.oxidized_copper_grate); + Item.registerItemBlock(Blocks.oxidized_copper); + Item.registerItemBlock(Blocks.oxidized_chiseled_copper); + Item.registerItemBlock(Blocks.exposed_cut_copper); + Item.registerItemBlock(Blocks.exposed_copper_grate); + Item.registerItemBlock(Blocks.exposed_copper); + Item.registerItemBlock(Blocks.exposed_chiseled_copper); + Item.registerItemBlock(Blocks.deepslate_copper_ore); + Item.registerItemBlock(Blocks.cut_copper); + Item.registerItemBlock(Blocks.copper_ore); + Item.registerItemBlock(Blocks.copper_grate); + Item.registerItemBlock(Blocks.copper_block); + Item.registerItemBlock(Blocks.chiseled_copper); + Item.registerItemBlock(Blocks.stone_tiles); + Item.registerItemBlock(Blocks.gold_tiles); + Item.registerItemBlock(Blocks.diorite_tiles); + Item.registerItemBlock(Blocks.deep_ocean_bricks); + Item.registerItemBlock(Blocks.decorated_stripped_spruce_log); + Item.registerItemBlock(Blocks.decorated_stripped_oak_log); + Item.registerItemBlock(Blocks.decorated_stripped_jungle_log); + Item.registerItemBlock(Blocks.decorated_stripped_dark_oak_log); + Item.registerItemBlock(Blocks.decorated_stripped_birch_log); + Item.registerItemBlock(Blocks.decorated_stripped_acacia_log); + Item.registerItemBlock(Blocks.decorated_spruce_planks); + Item.registerItemBlock(Blocks.decorated_spruce_log); + Item.registerItemBlock(Blocks.decorated_oak_planks); + Item.registerItemBlock(Blocks.decorated_oak_log); + Item.registerItemBlock(Blocks.decorated_jungle_planks); + Item.registerItemBlock(Blocks.decorated_jungle_log); + Item.registerItemBlock(Blocks.decorated_dark_oak_planks); + Item.registerItemBlock(Blocks.decorated_dark_oak_log); + Item.registerItemBlock(Blocks.decorated_birch_planks); + Item.registerItemBlock(Blocks.decorated_birch_log); + Item.registerItemBlock(Blocks.decorated_acacia_planks); + Item.registerItemBlock(Blocks.decorated_acacia_log); + Item.registerItemBlock(Blocks.chiseled_deep_ocean_bricks); + Item.registerItemBlock(Blocks.andesite_bricks); + } + + public static void renderItems(RenderItem e) { + e.registerBlock(Blocks.deepslate, "starlike:deepslate"); + e.registerBlock(Blocks.cobbled_deepslate, "starlike:cobbled_deepslate"); + e.registerBlock(Blocks.steel_block, "starlike:steel_block"); + e.registerBlock(Blocks.steel_grate, "starlike:steel_grate"); + e.registerBlock(Blocks.platinum_ore, "starlike:platinum_ore"); + e.registerBlock(Blocks.platinum_block, "starlike:platinum_block"); + e.registerBlock(Blocks.titanium_ore, "starlike:titanium_ore"); + e.registerBlock(Blocks.titanium_block, "starlike:titanium_block"); + e.registerBlock(Blocks.uranium_ore, "starlike:uranium_ore"); + e.registerBlock(Blocks.uranium_block, "starlike:uranium_block"); + e.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.OAK.getMetadata(), "starlike:oak_mosaic"); + e.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.SPRUCE.getMetadata(), "starlike:spruce_mosaic"); + e.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.BIRCH.getMetadata(), "starlike:birch_mosaic"); + e.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.JUNGLE.getMetadata(), "starlike:jungle_mosaic"); + e.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.ACACIA.getMetadata(), "starlike:acacia_mosaic"); + e.registerBlock(Blocks.mosaic, BlockMosaic.EnumType.DARK_OAK.getMetadata(), "starlike:dark_oak_mosaic"); + e.registerBlock(Blocks.dragonite_block, "starlike:dragonite_block"); + e.registerBlock(Blocks.ancient_debris, "starlike:ancient_debris"); + e.registerBlock(Blocks.netherite_block, "starlike:netherite_block"); + e.registerBlock(Blocks.smithing_table, "starlike:smithing_table"); + // e.registerBlock(Blocks.fabricator, "starlike:fabricator"); + + e.registerItem(Items.steel, "starlike:steel"); + e.registerItem(Items.platinum_ingot, "starlike:platinum_ingot"); + e.registerItem(Items.platinum_sword, "starlike:platinum_sword"); + e.registerItem(Items.platinum_pickaxe, "starlike:platinum_pickaxe"); + e.registerItem(Items.platinum_shovel, "starlike:platinum_shovel"); + e.registerItem(Items.platinum_axe, "starlike:platinum_axe"); + e.registerItem(Items.platinum_hoe, "starlike:platinum_hoe"); + e.registerItem(Items.platinum_helmet, "starlike:platinum_helmet"); + e.registerItem(Items.platinum_chestplate, "starlike:platinum_chestplate"); + e.registerItem(Items.platinum_leggings, "starlike:platinum_leggings"); + e.registerItem(Items.platinum_boots, "starlike:platinum_boots"); + e.registerItem(Items.titanium_ingot, "starlike:titanium_ingot"); + e.registerItem(Items.uranium_crystal, "starlike:uranium_crystal"); + e.registerItem(Items.uranium_rod, "starlike:uranium_rod"); + e.registerItem(Items.platinum_drill, "starlike:platinum_drill"); + e.registerItem(Items.titanium_drill, "starlike:titanium_drill"); + e.registerItem(Items.dragonite, "starlike:dragonite"); + e.registerItem(Items.copper_ingot, "starlike:copper_ingot"); + e.registerItem(Items.netherite_scrap, "starlike:netherite_scrap"); + e.registerItem(Items.netherite_ingot, "starlike:netherite_ingot"); + e.registerItem(Items.netherite_sword, "starlike:netherite_sword"); + e.registerItem(Items.netherite_shovel, "starlike:netherite_shovel"); + e.registerItem(Items.netherite_pickaxe, "starlike:netherite_pickaxe"); + e.registerItem(Items.netherite_axe, "starlike:netherite_axe"); + e.registerItem(Items.netherite_hoe, "starlike:netherite_hoe"); + e.registerItem(Items.netherite_helmet, "starlike:netherite_helmet"); + e.registerItem(Items.netherite_chestplate, "starlike:netherite_chestplate"); + e.registerItem(Items.netherite_leggings, "starlike:netherite_leggings"); + e.registerItem(Items.netherite_boots, "starlike:netherite_boots"); + e.registerItem(Items.chisel, "starlike:chisel"); + +//autogeneraterenderitem + e.registerBlock(Blocks.tuff_tiles, "starlike:tuff_tiles"); + e.registerBlock(Blocks.soul_stone_tiles, "starlike:soul_stone_tiles"); + e.registerBlock(Blocks.soul_stone, "starlike:soul_stone"); + e.registerBlock(Blocks.smooth_basalt, "starlike:smooth_basalt"); + e.registerBlock(Blocks.limestone_tiles, "starlike:limestone_tiles"); + e.registerBlock(Blocks.limestone, "starlike:limestone"); + e.registerBlock(Blocks.cobbled_soul_stone, "starlike:cobbled_soul_stone"); + e.registerBlock(Blocks.chiseled_warped_planks, "starlike:chiseled_warped_planks"); + e.registerBlock(Blocks.chiseled_spruce_planks, "starlike:chiseled_spruce_planks"); + e.registerBlock(Blocks.chiseled_oak_planks, "starlike:chiseled_oak_planks"); + e.registerBlock(Blocks.chiseled_mangrove_planks, "starlike:chiseled_mangrove_planks"); + e.registerBlock(Blocks.chiseled_jungle_planks, "starlike:chiseled_jungle_planks"); + e.registerBlock(Blocks.chiseled_dark_oak_planks, "starlike:chiseled_dark_oak_planks"); + e.registerBlock(Blocks.chiseled_crimson_planks, "starlike:chiseled_crimson_planks"); + e.registerBlock(Blocks.chiseled_cherry_planks, "starlike:chiseled_cherry_planks"); + e.registerBlock(Blocks.chiseled_birch_planks, "starlike:chiseled_birch_planks"); + e.registerBlock(Blocks.chiseled_bamboo_planks, "starlike:chiseled_bamboo_planks"); + e.registerBlock(Blocks.chiseled_acacia_planks, "starlike:chiseled_acacia_planks"); + e.registerBlock(Blocks.calcite_tiles, "starlike:calcite_tiles"); + e.registerBlock(Blocks.calcite, "starlike:calcite"); + e.registerBlock(Blocks.andesite_tiles, "starlike:andesite_tiles"); + e.registerBlock(Blocks.polished_blackstone_bricks, "starlike:polished_blackstone_bricks"); + e.registerBlock(Blocks.polished_blackstone, "starlike:polished_blackstone"); + e.registerBlock(Blocks.gilded_blackstone, "starlike:gilded_blackstone"); + e.registerBlock(Blocks.cracked_polished_blackstone_bricks, "starlike:cracked_polished_blackstone_bricks"); + e.registerBlock(Blocks.cracked_blackstone, "starlike:cracked_blackstone"); + e.registerBlock(Blocks.chiseled_polished_blackstone, "starlike:chiseled_polished_blackstone"); + e.registerBlock(Blocks.blackstone, "starlike:blackstone"); + e.registerBlock(Blocks.tuff_bricks, "starlike:tuff_bricks"); + e.registerBlock(Blocks.tuff, "starlike:tuff"); + e.registerBlock(Blocks.polished_tuff, "starlike:polished_tuff"); + e.registerBlock(Blocks.chiseled_tuff_top, "starlike:chiseled_tuff_top"); + e.registerBlock(Blocks.chiseled_tuff_bricks, "starlike:chiseled_tuff_bricks"); + e.registerBlock(Blocks.chiseled_tuff, "starlike:chiseled_tuff"); + e.registerBlock(Blocks.polished_granite_brick, "starlike:polished_granite_brick"); + e.registerBlock(Blocks.polished_diorite_brick, "starlike:polished_diorite_brick"); + e.registerBlock(Blocks.polished_andesite_brick, "starlike:polished_andesite_brick"); + e.registerBlock(Blocks.cobbled_granite, "starlike:cobbled_granite"); + e.registerBlock(Blocks.cobbled_diorite, "starlike:cobbled_diorite"); + e.registerBlock(Blocks.cobbled_andesite, "starlike:cobbled_andesite"); + e.registerBlock(Blocks.ornate_sandstone, "starlike:ornate_sandstone"); + e.registerBlock(Blocks.ornate_red_sandstone, "starlike:ornate_red_sandstone"); + e.registerBlock(Blocks.decorated_sandstone, "starlike:decorated_sandstone"); + e.registerBlock(Blocks.decorated_red_sandstone, "starlike:decorated_red_sandstone"); + e.registerBlock(Blocks.yellow_planks, "starlike:yellow_planks"); + e.registerBlock(Blocks.white_planks, "starlike:white_planks"); + e.registerBlock(Blocks.red_planks, "starlike:red_planks"); + e.registerBlock(Blocks.purple_planks, "starlike:purple_planks"); + e.registerBlock(Blocks.pink_planks, "starlike:pink_planks"); + e.registerBlock(Blocks.orange_planks, "starlike:orange_planks"); + e.registerBlock(Blocks.magenta_planks, "starlike:magenta_planks"); + e.registerBlock(Blocks.lime_planks, "starlike:lime_planks"); + e.registerBlock(Blocks.light_gray_planks, "starlike:light_gray_planks"); + e.registerBlock(Blocks.light_blue_planks, "starlike:light_blue_planks"); + e.registerBlock(Blocks.green_planks, "starlike:green_planks"); + e.registerBlock(Blocks.gray_planks, "starlike:gray_planks"); + e.registerBlock(Blocks.cyan_planks, "starlike:cyan_planks"); + e.registerBlock(Blocks.brown_planks, "starlike:brown_planks"); + e.registerBlock(Blocks.blue_planks, "starlike:blue_planks"); + e.registerBlock(Blocks.black_planks, "starlike:black_planks"); + e.registerBlock(Blocks.yellow_terracotta_bricks, "starlike:yellow_terracotta_bricks"); + e.registerBlock(Blocks.yellow_packed_terracotta, "starlike:yellow_packed_terracotta"); + e.registerBlock(Blocks.yellow_glazed_terracotta, "starlike:yellow_glazed_terracotta"); + e.registerBlock(Blocks.white_terracotta_bricks, "starlike:white_terracotta_bricks"); + e.registerBlock(Blocks.white_packed_terracotta, "starlike:white_packed_terracotta"); + e.registerBlock(Blocks.white_glazed_terracotta, "starlike:white_glazed_terracotta"); + e.registerBlock(Blocks.terracotta_bricks, "starlike:terracotta_bricks"); + e.registerBlock(Blocks.red_terracotta_bricks, "starlike:red_terracotta_bricks"); + e.registerBlock(Blocks.red_packed_terracotta, "starlike:red_packed_terracotta"); + e.registerBlock(Blocks.red_glazed_terracotta, "starlike:red_glazed_terracotta"); + e.registerBlock(Blocks.purple_terracotta_bricks, "starlike:purple_terracotta_bricks"); + e.registerBlock(Blocks.purple_packed_terracotta, "starlike:purple_packed_terracotta"); + e.registerBlock(Blocks.purple_glazed_terracotta, "starlike:purple_glazed_terracotta"); + e.registerBlock(Blocks.pink_terracotta_bricks, "starlike:pink_terracotta_bricks"); + e.registerBlock(Blocks.pink_packed_terracotta, "starlike:pink_packed_terracotta"); + e.registerBlock(Blocks.pink_glazed_terracotta, "starlike:pink_glazed_terracotta"); + e.registerBlock(Blocks.packed_terracotta, "starlike:packed_terracotta"); + e.registerBlock(Blocks.orange_terracotta_bricks, "starlike:orange_terracotta_bricks"); + e.registerBlock(Blocks.orange_packed_terracotta, "starlike:orange_packed_terracotta"); + e.registerBlock(Blocks.orange_glazed_terracotta, "starlike:orange_glazed_terracotta"); + e.registerBlock(Blocks.magenta_terracotta_bricks, "starlike:magenta_terracotta_bricks"); + e.registerBlock(Blocks.magenta_packed_terracotta, "starlike:magenta_packed_terracotta"); + e.registerBlock(Blocks.magenta_glazed_terracotta, "starlike:magenta_glazed_terracotta"); + e.registerBlock(Blocks.lime_terracotta_bricks, "starlike:lime_terracotta_bricks"); + e.registerBlock(Blocks.lime_packed_terracotta, "starlike:lime_packed_terracotta"); + e.registerBlock(Blocks.lime_glazed_terracotta, "starlike:lime_glazed_terracotta"); + e.registerBlock(Blocks.light_gray_terracotta_bricks, "starlike:light_gray_terracotta_bricks"); + e.registerBlock(Blocks.light_gray_packed_terracotta, "starlike:light_gray_packed_terracotta"); + e.registerBlock(Blocks.light_gray_glazed_terracotta, "starlike:light_gray_glazed_terracotta"); + e.registerBlock(Blocks.light_blue_terracotta_bricks, "starlike:light_blue_terracotta_bricks"); + e.registerBlock(Blocks.light_blue_packed_terracotta, "starlike:light_blue_packed_terracotta"); + e.registerBlock(Blocks.light_blue_glazed_terracotta, "starlike:light_blue_glazed_terracotta"); + e.registerBlock(Blocks.green_terracotta_bricks, "starlike:green_terracotta_bricks"); + e.registerBlock(Blocks.green_packed_terracotta, "starlike:green_packed_terracotta"); + e.registerBlock(Blocks.green_glazed_terracotta, "starlike:green_glazed_terracotta"); + e.registerBlock(Blocks.gray_terracotta_bricks, "starlike:gray_terracotta_bricks"); + e.registerBlock(Blocks.gray_packed_terracotta, "starlike:gray_packed_terracotta"); + e.registerBlock(Blocks.gray_glazed_terracotta, "starlike:gray_glazed_terracotta"); + e.registerBlock(Blocks.cyan_terracotta_bricks, "starlike:cyan_terracotta_bricks"); + e.registerBlock(Blocks.cyan_packed_terracotta, "starlike:cyan_packed_terracotta"); + e.registerBlock(Blocks.cyan_glazed_terracotta, "starlike:cyan_glazed_terracotta"); + e.registerBlock(Blocks.brown_terracotta_bricks, "starlike:brown_terracotta_bricks"); + e.registerBlock(Blocks.brown_packed_terracotta, "starlike:brown_packed_terracotta"); + e.registerBlock(Blocks.brown_glazed_terracotta, "starlike:brown_glazed_terracotta"); + e.registerBlock(Blocks.blue_terracotta_bricks, "starlike:blue_terracotta_bricks"); + e.registerBlock(Blocks.blue_packed_terracotta, "starlike:blue_packed_terracotta"); + e.registerBlock(Blocks.blue_glazed_terracotta, "starlike:blue_glazed_terracotta"); + e.registerBlock(Blocks.black_terracotta_bricks, "starlike:black_terracotta_bricks"); + e.registerBlock(Blocks.black_packed_terracotta, "starlike:black_packed_terracotta"); + e.registerBlock(Blocks.black_glazed_terracotta, "starlike:black_glazed_terracotta"); + e.registerBlock(Blocks.zombie_chiseled_stone_bricks, "starlike:zombie_chiseled_stone_bricks"); + e.registerBlock(Blocks.skeleton_chiseled_red_sandstone, "starlike:skeleton_chiseled_red_sandstone"); + e.registerBlock(Blocks.head_chiseled_deepslate, "starlike:head_chiseled_deepslate"); + e.registerBlock(Blocks.ghast_chiseled_quartz_block, "starlike:ghast_chiseled_quartz_block"); + e.registerBlock(Blocks.creeper_chiseled_sandstone, "starlike:creeper_chiseled_sandstone"); + e.registerBlock(Blocks.weathered_cut_copper, "starlike:weathered_cut_copper"); + e.registerBlock(Blocks.weathered_copper_grate, "starlike:weathered_copper_grate"); + e.registerBlock(Blocks.weathered_copper, "starlike:weathered_copper"); + e.registerBlock(Blocks.weathered_chiseled_copper, "starlike:weathered_chiseled_copper"); + e.registerBlock(Blocks.raw_copper_block, "starlike:raw_copper_block"); + e.registerBlock(Blocks.raw_copper, "starlike:raw_copper"); + e.registerBlock(Blocks.oxidized_cut_copper, "starlike:oxidized_cut_copper"); + e.registerBlock(Blocks.oxidized_copper_grate, "starlike:oxidized_copper_grate"); + e.registerBlock(Blocks.oxidized_copper, "starlike:oxidized_copper"); + e.registerBlock(Blocks.oxidized_chiseled_copper, "starlike:oxidized_chiseled_copper"); + e.registerBlock(Blocks.exposed_cut_copper, "starlike:exposed_cut_copper"); + e.registerBlock(Blocks.exposed_copper_grate, "starlike:exposed_copper_grate"); + e.registerBlock(Blocks.exposed_copper, "starlike:exposed_copper"); + e.registerBlock(Blocks.exposed_chiseled_copper, "starlike:exposed_chiseled_copper"); + e.registerBlock(Blocks.deepslate_copper_ore, "starlike:deepslate_copper_ore"); + e.registerBlock(Blocks.cut_copper, "starlike:cut_copper"); + e.registerBlock(Blocks.copper_ore, "starlike:copper_ore"); + e.registerBlock(Blocks.copper_grate, "starlike:copper_grate"); + e.registerBlock(Blocks.copper_block, "starlike:copper_block"); + e.registerBlock(Blocks.chiseled_copper, "starlike:chiseled_copper"); + e.registerBlock(Blocks.stone_tiles, "starlike:stone_tiles"); + e.registerBlock(Blocks.gold_tiles, "starlike:gold_tiles"); + e.registerBlock(Blocks.diorite_tiles, "starlike:diorite_tiles"); + e.registerBlock(Blocks.deep_ocean_bricks, "starlike:deep_ocean_bricks"); + e.registerBlock(Blocks.decorated_stripped_spruce_log, "starlike:decorated_stripped_spruce_log"); + e.registerBlock(Blocks.decorated_stripped_oak_log, "starlike:decorated_stripped_oak_log"); + e.registerBlock(Blocks.decorated_stripped_jungle_log, "starlike:decorated_stripped_jungle_log"); + e.registerBlock(Blocks.decorated_stripped_dark_oak_log, "starlike:decorated_stripped_dark_oak_log"); + e.registerBlock(Blocks.decorated_stripped_birch_log, "starlike:decorated_stripped_birch_log"); + e.registerBlock(Blocks.decorated_stripped_acacia_log, "starlike:decorated_stripped_acacia_log"); + e.registerBlock(Blocks.decorated_spruce_planks, "starlike:decorated_spruce_planks"); + e.registerBlock(Blocks.decorated_spruce_log, "starlike:decorated_spruce_log"); + e.registerBlock(Blocks.decorated_oak_planks, "starlike:decorated_oak_planks"); + e.registerBlock(Blocks.decorated_oak_log, "starlike:decorated_oak_log"); + e.registerBlock(Blocks.decorated_jungle_planks, "starlike:decorated_jungle_planks"); + e.registerBlock(Blocks.decorated_jungle_log, "starlike:decorated_jungle_log"); + e.registerBlock(Blocks.decorated_dark_oak_planks, "starlike:decorated_dark_oak_planks"); + e.registerBlock(Blocks.decorated_dark_oak_log, "starlike:decorated_dark_oak_log"); + e.registerBlock(Blocks.decorated_birch_planks, "starlike:decorated_birch_planks"); + e.registerBlock(Blocks.decorated_birch_log, "starlike:decorated_birch_log"); + e.registerBlock(Blocks.decorated_acacia_planks, "starlike:decorated_acacia_planks"); + e.registerBlock(Blocks.decorated_acacia_log, "starlike:decorated_acacia_log"); + e.registerBlock(Blocks.chiseled_deep_ocean_bricks, "starlike:chiseled_deep_ocean_bricks"); + e.registerBlock(Blocks.andesite_bricks, "starlike:andesite_bricks"); + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/init/RecipesStarlike.java b/src/main/java/net/starlikeclient/minecraft/init/RecipesStarlike.java new file mode 100644 index 00000000..3fd9ec3b --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/init/RecipesStarlike.java @@ -0,0 +1,155 @@ +package net.starlikeclient.minecraft.init; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockPlanks; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.starlikeclient.minecraft.blocks.BlockMosaic; +import net.starlikeclient.minecraft.guis.crafting.SmithingManager; + +public class RecipesStarlike { + public static void addCraftingRecipes(CraftingManager e) { + addIngotRecipe(e, Blocks.netherite_block, Items.netherite_ingot); + addIngotRecipe(e, Blocks.steel_block, Items.steel); + addIngotRecipe(e, Blocks.platinum_block, Items.platinum_ingot); + addIngotRecipe(e, Blocks.titanium_block, Items.titanium_ingot); + addIngotRecipe(e, Blocks.uranium_block, Items.uranium_crystal); + addIngotRecipe(e, Blocks.dragonite_block, Items.dragonite); + + e.addRecipe(new ItemStack(Blocks.steel_grate, 4), + new Object[] { " S ", "S S", " S ", Character.valueOf('S'), Items.steel }); + e.addRecipe(new ItemStack(Items.platinum_sword, 1), new Object[] { "P", "P", "B", Character.valueOf('P'), + Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); + e.addRecipe(new ItemStack(Items.platinum_pickaxe, 1), new Object[] { "PPP", " B ", " B ", + Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); + e.addRecipe(new ItemStack(Items.platinum_shovel, 1), new Object[] { "P", "B", "B", Character.valueOf('P'), + Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); + e.addRecipe(new ItemStack(Items.platinum_axe, 1), new Object[] { " PP", " BP", " B ", Character.valueOf('P'), + Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); + e.addRecipe(new ItemStack(Items.platinum_hoe, 1), new Object[] { " PP", " B ", " B ", Character.valueOf('P'), + Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); + e.addRecipe(new ItemStack(Items.platinum_helmet, 1), + new Object[] { "PPP", "P P", Character.valueOf('P'), Items.platinum_ingot }); + e.addRecipe(new ItemStack(Items.platinum_chestplate, 1), + new Object[] { "P P", "PPP", "PPP", Character.valueOf('P'), Items.platinum_ingot }); + e.addRecipe(new ItemStack(Items.platinum_leggings, 1), + new Object[] { "PPP", "P P", "P P", Character.valueOf('P'), Items.platinum_ingot }); + e.addRecipe(new ItemStack(Items.platinum_boots, 1), + new Object[] { "P P", "P P", Character.valueOf('P'), Items.platinum_ingot }); + e.addRecipe(new ItemStack(Items.uranium_rod, 1), + new Object[] { "U", "U", "U", Character.valueOf('U'), Items.uranium_crystal, }); + e.addRecipe(new ItemStack(Items.platinum_drill, 1), + new Object[] { " PP", "SSP", "US ", Character.valueOf('P'), Items.platinum_ingot, + Character.valueOf('S'), Blocks.steel_block, Character.valueOf('U'), Items.uranium_rod }); + e.addRecipe(new ItemStack(Items.titanium_drill, 1), new Object[] { "TTT", "TDT", "TTT", Character.valueOf('T'), + Items.titanium_ingot, Character.valueOf('D'), Items.platinum_drill }); + for (BlockPlanks.EnumType variant : BlockPlanks.EnumType.values()) { + e.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.valueOf(variant.name()).getMetadata()), + new Object[] { " # ", "# #", " # ", Character.valueOf('#'), + new ItemStack(Blocks.planks, 1, variant.getMetadata()) }); + } + e.addRecipe(new ItemStack(Blocks.dragon_egg, 2), new Object[] { "DDD", "DED", "DDD", Character.valueOf('E'), + Blocks.dragon_egg, Character.valueOf('D'), Blocks.dragonite_block }); + e.addShapelessRecipe(new ItemStack(Items.netherite_ingot, 1), + new Object[] { new ItemStack(Items.netherite_scrap, 1), new ItemStack(Items.netherite_scrap, 1), + new ItemStack(Items.netherite_scrap, 1), new ItemStack(Items.netherite_scrap, 1), + new ItemStack(Items.gold_ingot, 1), new ItemStack(Items.gold_ingot, 1), + new ItemStack(Items.gold_ingot, 1), new ItemStack(Items.gold_ingot, 1) }); + e.addRecipe(new ItemStack(Items.chisel, 1), new Object[] { " #", " / ", "/ ", Character.valueOf('#'), + Items.steel, Character.valueOf('/'), Items.stick }); + e.addRecipe(new ItemStack(Blocks.smithing_table), new Object[] { "//", "##", "##", Character.valueOf('/'), + Items.iron_ingot, Character.valueOf('#'), Blocks.planks }); + + // Copper + e.addRecipe(new ItemStack(Blocks.copper_block, 1), + new Object[] { "###", "###", "###", Character.valueOf('#'), Items.copper_ingot }); + e.addRecipe(new ItemStack(Blocks.cut_copper, 1), + new Object[] { "#C#", "CCC", "#C#", Character.valueOf('C'), Items.copper_ingot, }); + e.addRecipe(new ItemStack(Blocks.chiseled_copper, 1), + new Object[] { "#C#", "C#C", "#C#", Character.valueOf('C'), Items.copper_ingot, }); + e.addRecipe(new ItemStack(Blocks.copper_grate, 1), + new Object[] { "CCC", "C#C", "CCC", Character.valueOf('C'), Items.copper_ingot, }); + e.addRecipe(new ItemStack(Blocks.exposed_copper, 8), new Object[] { "###", "#W#", "###", Character.valueOf('W'), + Items.water_bucket, Character.valueOf('#'), Blocks.copper_block }); + e.addRecipe(new ItemStack(Blocks.weathered_copper, 8), new Object[] { "###", "#E#", "###", + Character.valueOf('E'), Blocks.exposed_copper, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.oxidized_copper, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('W'), Blocks.weathered_copper, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.exposed_cut_copper, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('#'), Blocks.cut_copper, Character.valueOf('W'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.weathered_cut_copper, 8), new Object[] { "###", "#E#", "###", + Character.valueOf('E'), Blocks.exposed_cut_copper, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.oxidized_cut_copper, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('W'), Blocks.weathered_cut_copper, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.exposed_chiseled_copper, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('#'), Blocks.chiseled_copper, Character.valueOf('W'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.weathered_chiseled_copper, 8), new Object[] { "###", "#E#", "###", + Character.valueOf('E'), Blocks.exposed_chiseled_copper, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.oxidized_chiseled_copper, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('W'), Blocks.weathered_chiseled_copper, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.exposed_copper_grate, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('#'), Blocks.copper_grate, Character.valueOf('W'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.weathered_copper_grate, 8), new Object[] { "###", "#E#", "###", + Character.valueOf('E'), Blocks.exposed_copper_grate, Character.valueOf('#'), Items.water_bucket }); + e.addRecipe(new ItemStack(Blocks.oxidized_copper_grate, 8), new Object[] { "###", "#W#", "###", + Character.valueOf('W'), Blocks.weathered_copper_grate, Character.valueOf('#'), Items.water_bucket }); + + // Terracotta + e.addRecipe(new ItemStack(Blocks.packed_terracotta, 1), + new Object[] { "##", "##", Character.valueOf('#'), Blocks.hardened_clay }); + for (EnumDyeColor color : EnumDyeColor.values()) { + String colorName = color.getName(); + e.addRecipe( + new ItemStack(Block.getBlockFromName( + "starlike:" + (colorName == "silver" ? "light_gray" : colorName) + "_packed_terracotta"), + 1), + new Object[] { "##", "##", Character.valueOf('#'), + new ItemStack(Blocks.stained_hardened_clay, 1, color.getMetadata()) }); + } + } + + public static void addFurnaceRecipes(FurnaceRecipes e) { + e.addSmeltingRecipeForBlock(Blocks.coal_ore, new ItemStack(Items.coal), 0.1F); + e.addSmeltingRecipeForBlock(Blocks.redstone_ore, new ItemStack(Items.redstone), 0.7F); + e.addSmeltingRecipeForBlock(Blocks.lapis_ore, new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeDamage()), + 0.2F); + e.addSmeltingRecipeForBlock(Blocks.quartz_ore, new ItemStack(Items.quartz), 0.2F); + + e.addSmeltingRecipeForBlock(Blocks.cobbled_deepslate, new ItemStack(Blocks.deepslate), 0.1F); + e.addSmelting(Items.iron_ingot, new ItemStack(Items.steel), 1.2F); + e.addSmeltingRecipeForBlock(Blocks.platinum_ore, new ItemStack(Items.platinum_ingot), 1.5F); + e.addSmeltingRecipeForBlock(Blocks.titanium_ore, new ItemStack(Items.titanium_ingot), 2.0F); + e.addSmeltingRecipeForBlock(Blocks.uranium_ore, new ItemStack(Items.uranium_crystal), 0.2F); + e.addSmeltingRecipeForBlock(Blocks.copper_ore, new ItemStack(Items.copper_ingot), 0.15F); + e.addSmeltingRecipeForBlock(Blocks.deepslate_copper_ore, new ItemStack(Items.copper_ingot), 0.15F); + e.addSmeltingRecipeForBlock(Blocks.ancient_debris, new ItemStack(Items.netherite_scrap), 2.0F); + } + + private static void addIngotRecipe(CraftingManager e, Block block, Item item) { + ItemStack itemstack = new ItemStack(item, 9); + e.addRecipe(new ItemStack(block), new Object[] { "###", "###", "###", Character.valueOf('#'), itemstack }); + e.addRecipe(itemstack, new Object[] { "#", Character.valueOf('#'), block }); + } + + private static void addIngotRecipe(CraftingManager e, Block block, ItemStack itemstack) { + e.addRecipe(new ItemStack(block), new Object[] { "###", "###", "###", Character.valueOf('#'), itemstack }); + e.addRecipe(itemstack, new Object[] { "#", Character.valueOf('#'), block }); + } + + public static void addSmithingRecipes(SmithingManager e) { + e.addSmithingRecipe(new ItemStack(Items.diamond_sword), new ItemStack(Items.netherite_sword)); + e.addSmithingRecipe(new ItemStack(Items.diamond_pickaxe), new ItemStack(Items.netherite_pickaxe)); + e.addSmithingRecipe(new ItemStack(Items.diamond_axe), new ItemStack(Items.netherite_axe)); + e.addSmithingRecipe(new ItemStack(Items.diamond_shovel), new ItemStack(Items.netherite_shovel)); + e.addSmithingRecipe(new ItemStack(Items.diamond_hoe), new ItemStack(Items.netherite_hoe)); + e.addSmithingRecipe(new ItemStack(Items.diamond_helmet), new ItemStack(Items.netherite_helmet)); + e.addSmithingRecipe(new ItemStack(Items.diamond_chestplate), new ItemStack(Items.netherite_chestplate)); + e.addSmithingRecipe(new ItemStack(Items.diamond_leggings), new ItemStack(Items.netherite_leggings)); + e.addSmithingRecipe(new ItemStack(Items.diamond_boots), new ItemStack(Items.netherite_boots)); + } +} \ No newline at end of file diff --git a/src/main/java/net/starlikeclient/minecraft/items/ItemChisel.java b/src/main/java/net/starlikeclient/minecraft/items/ItemChisel.java new file mode 100644 index 00000000..07f79b3b --- /dev/null +++ b/src/main/java/net/starlikeclient/minecraft/items/ItemChisel.java @@ -0,0 +1,226 @@ +package net.starlikeclient.minecraft.items; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockColored; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockQuartz; +import net.minecraft.block.BlockRedSandstone; +import net.minecraft.block.BlockSandStone; +import net.minecraft.block.BlockStone; +import net.minecraft.block.BlockStoneBrick; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.EnumAction; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class ItemChisel extends Item { + private static final Map blockReplacementMap = new HashMap<>(); + static { + // Copper + blockReplacementMap.put(Blocks.copper_block.getDefaultState(), Blocks.chiseled_copper.getDefaultState()); + blockReplacementMap.put(Blocks.weathered_copper.getDefaultState(), + Blocks.weathered_chiseled_copper.getDefaultState()); + blockReplacementMap.put(Blocks.exposed_copper.getDefaultState(), + Blocks.exposed_chiseled_copper.getDefaultState()); + blockReplacementMap.put(Blocks.oxidized_copper.getDefaultState(), + Blocks.oxidized_chiseled_copper.getDefaultState()); + + // Ocean Bricks + blockReplacementMap.put(Blocks.deep_ocean_bricks.getDefaultState(), + Blocks.chiseled_deep_ocean_bricks.getDefaultState()); + + // Sandstone + blockReplacementMap.put( + Blocks.sandstone.getDefaultState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.DEFAULT), + Blocks.sandstone.getDefaultState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.CHISELED)); + blockReplacementMap.put( + Blocks.sandstone.getDefaultState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.CHISELED), + Blocks.creeper_chiseled_sandstone.getDefaultState()); + + // Red Sandstone + blockReplacementMap.put( + Blocks.red_sandstone.getDefaultState().withProperty(BlockRedSandstone.TYPE, + BlockRedSandstone.EnumType.DEFAULT), + Blocks.red_sandstone.getDefaultState().withProperty(BlockRedSandstone.TYPE, + BlockRedSandstone.EnumType.CHISELED)); + blockReplacementMap.put(Blocks.red_sandstone.getDefaultState().withProperty(BlockRedSandstone.TYPE, + BlockRedSandstone.EnumType.CHISELED), Blocks.skeleton_chiseled_red_sandstone.getDefaultState()); + + // Stone Bricks + blockReplacementMap.put( + Blocks.stonebrick.getDefaultState().withProperty(BlockStoneBrick.VARIANT, + BlockStoneBrick.EnumType.DEFAULT), + Blocks.stonebrick.getDefaultState().withProperty(BlockStoneBrick.VARIANT, + BlockStoneBrick.EnumType.CRACKED)); + blockReplacementMap.put( + Blocks.stonebrick.getDefaultState().withProperty(BlockStoneBrick.VARIANT, + BlockStoneBrick.EnumType.CRACKED), + Blocks.stonebrick.getDefaultState().withProperty(BlockStoneBrick.VARIANT, + BlockStoneBrick.EnumType.CHISELED)); + blockReplacementMap.put(Blocks.stonebrick.getDefaultState().withProperty(BlockStoneBrick.VARIANT, + BlockStoneBrick.EnumType.CHISELED), Blocks.zombie_chiseled_stone_bricks.getDefaultState()); + + // Soul Stone + blockReplacementMap.put(Blocks.soul_stone.getDefaultState(), Blocks.cobbled_soul_stone.getDefaultState()); + blockReplacementMap.put(Blocks.cobbled_soul_stone.getDefaultState(), Blocks.soul_stone_tiles.getDefaultState()); + + // Deepslate + blockReplacementMap.put(Blocks.deepslate.getDefaultState(), Blocks.cobbled_deepslate.getDefaultState()); + blockReplacementMap.put(Blocks.cobbled_deepslate.getDefaultState(), + Blocks.head_chiseled_deepslate.getDefaultState()); + + // Quartz + blockReplacementMap.put( + Blocks.quartz_block.getDefaultState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.DEFAULT), + Blocks.quartz_block.getDefaultState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.CHISELED)); + blockReplacementMap.put( + Blocks.quartz_block.getDefaultState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.CHISELED), + Blocks.ghast_chiseled_quartz_block.getDefaultState()); + + // Gold Blocks + blockReplacementMap.put(Blocks.gold_block.getDefaultState(), Blocks.gold_tiles.getDefaultState()); + + // Stone + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.STONE), + Blocks.cobblestone.getDefaultState()); + blockReplacementMap.put(Blocks.cobblestone.getDefaultState(), Blocks.stone_tiles.getDefaultState()); + + // Granite + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.GRANITE), + Blocks.cobbled_granite.getDefaultState()); + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.GRANITE_SMOOTH), + Blocks.polished_granite_brick.getDefaultState()); + + // Diorite + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.DIORITE), + Blocks.cobbled_diorite.getDefaultState()); + blockReplacementMap.put(Blocks.cobbled_diorite.getDefaultState(), Blocks.diorite_tiles.getDefaultState()); + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.DIORITE_SMOOTH), + Blocks.polished_diorite_brick.getDefaultState()); + + // Andesite + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.ANDESITE), + Blocks.cobbled_andesite.getDefaultState()); + blockReplacementMap.put(Blocks.cobbled_andesite.getDefaultState(), Blocks.andesite_tiles.getDefaultState()); + blockReplacementMap.put(Blocks.andesite_tiles.getDefaultState(), Blocks.andesite_bricks.getDefaultState()); + blockReplacementMap.put( + Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.ANDESITE_SMOOTH), + Blocks.polished_andesite_brick.getDefaultState()); + + // Limestone + blockReplacementMap.put(Blocks.limestone.getDefaultState(), Blocks.limestone_tiles.getDefaultState()); + + // Blackstone + blockReplacementMap.put(Blocks.blackstone.getDefaultState(), Blocks.cracked_blackstone.getDefaultState()); + blockReplacementMap.put(Blocks.polished_blackstone.getDefaultState(), + Blocks.polished_blackstone_bricks.getDefaultState()); + blockReplacementMap.put(Blocks.polished_blackstone_bricks.getDefaultState(), + Blocks.cracked_polished_blackstone_bricks.getDefaultState()); + blockReplacementMap.put(Blocks.cracked_polished_blackstone_bricks.getDefaultState(), + Blocks.chiseled_polished_blackstone.getDefaultState()); + + // Tuff + blockReplacementMap.put(Blocks.tuff.getDefaultState(), Blocks.tuff_tiles.getDefaultState()); + blockReplacementMap.put(Blocks.tuff_tiles.getDefaultState(), Blocks.tuff_bricks.getDefaultState()); + blockReplacementMap.put(Blocks.tuff_bricks.getDefaultState(), Blocks.chiseled_tuff_bricks.getDefaultState()); + blockReplacementMap.put(Blocks.chiseled_tuff_bricks.getDefaultState(), Blocks.chiseled_tuff.getDefaultState()); + blockReplacementMap.put(Blocks.chiseled_tuff.getDefaultState(), Blocks.chiseled_tuff_top.getDefaultState()); + + // Calcite + blockReplacementMap.put(Blocks.calcite.getDefaultState(), Blocks.calcite_tiles.getDefaultState()); + + // Planks + for (BlockPlanks.EnumType variant : BlockPlanks.EnumType.values()) { + blockReplacementMap.put(Blocks.planks.getDefaultState().withProperty(BlockPlanks.VARIANT, variant), + Block.getBlockFromName("starlike:decorated_" + variant.getName() + "_planks").getDefaultState()); + } + + // Terracotta + blockReplacementMap.put(Blocks.hardened_clay.getDefaultState(), Blocks.terracotta_bricks.getDefaultState()); + for (EnumDyeColor color : EnumDyeColor.values()) { + String colorName = color.getName(); + blockReplacementMap.put( + Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, color), + Block.getBlockFromName("starlike:" + + (colorName.toLowerCase() == "silver" ? "light_gray" : colorName) + "_terracotta_bricks") + .getDefaultState()); + } + } + + public ItemChisel() { + this.setMaxStackSize(1); + this.setMaxDamage(212); + this.setCreativeTab(CreativeTabs.tabStarlike); + } + + /** + * + returns the action that specifies what animation to play when the items is + * being used + */ + @Override + public EnumAction getItemUseAction(ItemStack var1) { + return EnumAction.CHISEL; + } + + /** + * + How long it takes to use or consume an item + */ + @Override + public int getMaxItemUseDuration(ItemStack var1) { + return 32; + } + + /** + * + Called whenever this item is equipped and the right mouse button is + * pressed. Args: itemStack, world, entityPlayer + */ + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { + MovingObjectPosition movingObjectPosition = this.getMovingObjectPositionFromPlayer(world, entityplayer, false); + if (movingObjectPosition != null + && movingObjectPosition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + BlockPos blockPos = movingObjectPosition.getBlockPos(); + IBlockState blockState = world.getBlockState(blockPos); + if (blockReplacementMap.containsKey(blockState)) { + entityplayer.setItemInUse(itemstack, this.getMaxItemUseDuration(itemstack)); + } + } + return itemstack; + } + + /** + * + Called when the player finishes using this Item (E.g. finishes eating.). + * Not called when the player stops using the Item before the action is + * complete. + */ + @Override + public ItemStack onItemUseFinish(ItemStack itemstack, World world, EntityPlayer entityplayer) { + MovingObjectPosition movingObjectPosition = this.getMovingObjectPositionFromPlayer(world, entityplayer, false); + if (movingObjectPosition != null + && movingObjectPosition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + BlockPos blockPos = movingObjectPosition.getBlockPos(); + IBlockState blockState = world.getBlockState(blockPos); + if (blockReplacementMap.containsKey(blockState)) { + world.setBlockState(blockPos, blockReplacementMap.get(blockState)); + itemstack.damageItem(1, entityplayer); + } + } + return itemstack; + } +} \ No newline at end of file diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java index 631371d0..0d0136cb 100644 --- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java +++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java @@ -22,6 +22,8 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; +import net.lax1dude.eaglercraft.v1_8.EagRuntime; + /** *

* {@code StopWatch} provides a convenient API for timings. @@ -314,7 +316,7 @@ public class StopWatch { } else if (this.runningState == State.UNSTARTED) { return 0; } else if (this.runningState == State.RUNNING) { - return System.nanoTime() - this.startTimeNanos; + return EagRuntime.nanoTime() - this.startTimeNanos; } throw new IllegalStateException("Illegal running state has occurred."); } @@ -497,7 +499,7 @@ public class StopWatch { if (this.runningState != State.SUSPENDED) { throw new IllegalStateException("Stopwatch must be suspended to resume. "); } - this.startTimeNanos += System.nanoTime() - this.stopTimeNanos; + this.startTimeNanos += EagRuntime.nanoTime() - this.stopTimeNanos; this.runningState = State.RUNNING; } @@ -518,7 +520,7 @@ public class StopWatch { if (this.runningState != State.RUNNING) { throw new IllegalStateException("Stopwatch is not running. "); } - this.stopTimeNanos = System.nanoTime(); + this.stopTimeNanos = EagRuntime.nanoTime(); this.splitState = SplitState.SPLIT; } @@ -540,7 +542,7 @@ public class StopWatch { if (this.runningState != State.UNSTARTED) { throw new IllegalStateException("Stopwatch already started. "); } - this.startTimeNanos = System.nanoTime(); + this.startTimeNanos = EagRuntime.nanoTime(); this.startTimeMillis = System.currentTimeMillis(); this.runningState = State.RUNNING; } @@ -561,7 +563,7 @@ public class StopWatch { throw new IllegalStateException("Stopwatch is not running. "); } if (this.runningState == State.RUNNING) { - this.stopTimeNanos = System.nanoTime(); + this.stopTimeNanos = EagRuntime.nanoTime(); this.stopTimeMillis = System.currentTimeMillis(); } this.runningState = State.STOPPED; @@ -583,7 +585,7 @@ public class StopWatch { if (this.runningState != State.RUNNING) { throw new IllegalStateException("Stopwatch must be running to suspend. "); } - this.stopTimeNanos = System.nanoTime(); + this.stopTimeNanos = EagRuntime.nanoTime(); this.stopTimeMillis = System.currentTimeMillis(); this.runningState = State.SUSPENDED; } diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java index 270622c7..38e6faff 100644 --- a/src/main/java/org/json/JSONObject.java +++ b/src/main/java/org/json/JSONObject.java @@ -4,22 +4,17 @@ package org.json; Public Domain. */ -import java.io.Closeable; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; -import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; -import java.util.IdentityHashMap; import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -281,42 +276,42 @@ public class JSONObject { } } - private static String getKeyNameFromMethod(Method method) { - final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class); - if (ignoreDepth > 0) { - final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class); - if (forcedNameDepth < 0 || ignoreDepth <= forcedNameDepth) { - // the hierarchy asked to ignore, and the nearest name override - // was higher or non-existent - return null; - } - } - JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class); - if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) { - return annotation.value(); - } - String key; - final String name = method.getName(); - if (name.startsWith("get") && name.length() > 3) { - key = name.substring(3); - } else if (name.startsWith("is") && name.length() > 2) { - key = name.substring(2); - } else { - return null; - } - // if the first letter in the key is not uppercase, then skip. - // This is to maintain backwards compatibility before PR406 - // (https://github.com/stleary/JSON-java/pull/406/) - if (key.length() == 0 || Character.isLowerCase(key.charAt(0))) { - return null; - } - if (key.length() == 1) { - key = key.toLowerCase(Locale.ROOT); - } else if (!Character.isUpperCase(key.charAt(1))) { - key = key.substring(0, 1).toLowerCase(Locale.ROOT) + key.substring(1); - } - return key; - } +// private static String getKeyNameFromMethod(Method method) { +// final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class); +// if (ignoreDepth > 0) { +// final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class); +// if (forcedNameDepth < 0 || ignoreDepth <= forcedNameDepth) { +// // the hierarchy asked to ignore, and the nearest name override +// // was higher or non-existent +// return null; +// } +// } +// JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class); +// if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) { +// return annotation.value(); +// } +// String key; +// final String name = method.getName(); +// if (name.startsWith("get") && name.length() > 3) { +// key = name.substring(3); +// } else if (name.startsWith("is") && name.length() > 2) { +// key = name.substring(2); +// } else { +// return null; +// } +// // if the first letter in the key is not uppercase, then skip. +// // This is to maintain backwards compatibility before PR406 +// // (https://github.com/stleary/JSON-java/pull/406/) +// if (key.length() == 0 || Character.isLowerCase(key.charAt(0))) { +// return null; +// } +// if (key.length() == 1) { +// key = key.toLowerCase(Locale.ROOT); +// } else if (!Character.isUpperCase(key.charAt(1))) { +// key = key.substring(0, 1).toLowerCase(Locale.ROOT) + key.substring(1); +// } +// return key; +// } /** * Get an array of field names from a JSONObject. @@ -415,9 +410,9 @@ public class JSONObject { return lBigDecimal.compareTo(rBigDecimal) == 0; } - private static boolean isValidMethodName(String name) { - return !"getClass".equals(name) && !"getDeclaringClass".equals(name); - } +// private static boolean isValidMethodName(String name) { +// return !"getClass".equals(name) && !"getDeclaringClass".equals(name); +// } private static boolean numberIsFinite(Number n) { if (n instanceof Double && (((Double) n).isInfinite() || ((Double) n).isNaN())) { @@ -905,10 +900,11 @@ public class JSONObject { || object.getClass().getClassLoader() == null) { return object.toString(); } - if (objectsRecord != null) { - return new JSONObject(object, objectsRecord); - } - return new JSONObject(object); +// if (objectsRecord != null) { +// return new JSONObject(object, objectsRecord); +// } +// return new JSONObject(object); + throw new UnsupportedOperationException("Unsupported type: " + object.getClass().getSimpleName()); } catch (JSONException exception) { throw exception; } catch (Exception exception) { @@ -1218,15 +1214,15 @@ public class JSONObject { * JSONObject. * @throws JSONException If a getter returned a non-finite number. */ - public JSONObject(Object bean) { - this(); - this.populateMap(bean); - } - - private JSONObject(Object bean, Set objectsRecord) { - this(); - this.populateMap(bean, objectsRecord); - } +// public JSONObject(Object bean) { +// this(); +// this.populateMap(bean); +// } +// +// private JSONObject(Object bean, Set objectsRecord) { +// this(); +// this.populateMap(bean, objectsRecord); +// } /** * Construct a JSONObject from an Object, using reflection to find the public @@ -2297,60 +2293,63 @@ public class JSONObject { * @param bean the bean * @throws JSONException If a getter returned a non-finite number. */ - private void populateMap(Object bean) { - populateMap(bean, Collections.newSetFromMap(new IdentityHashMap())); - } +// private void populateMap(Object bean) { +// populateMap(bean, Collections.newSetFromMap(new IdentityHashMap())); +// } - private void populateMap(Object bean, Set objectsRecord) { - Class klass = bean.getClass(); - - // If klass is a System class then set includeSuperClass to false. - - boolean includeSuperClass = klass.getClassLoader() != null; - - Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods(); - for (final Method method : methods) { - final int modifiers = method.getModifiers(); - if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers) && method.getParameterTypes().length == 0 - && !method.isBridge() && method.getReturnType() != Void.TYPE - && isValidMethodName(method.getName())) { - final String key = getKeyNameFromMethod(method); - if (key != null && !key.isEmpty()) { - try { - final Object result = method.invoke(bean); - if (result != null) { - // check cyclic dependency and throw error if needed - // the wrap and populateMap combination method is - // itself DFS recursive - if (objectsRecord.contains(result)) { - throw recursivelyDefinedObjectException(key); - } - - objectsRecord.add(result); - - testValidity(result); - this.map.put(key, wrap(result, objectsRecord)); - - objectsRecord.remove(result); - - // we don't use the result anywhere outside of wrap - // if it's a resource we should be sure to close it - // after calling toString - if (result instanceof Closeable) { - try { - ((Closeable) result).close(); - } catch (IOException ignore) { - } - } - } - } catch (IllegalAccessException ignore) { - } catch (IllegalArgumentException ignore) { - } catch (InvocationTargetException ignore) { - } - } - } - } - } +// private void populateMap(Object bean, Set objectsRecord) { +// Class klass = bean.getClass(); +// +// // If klass is a System class then set includeSuperClass to false. +// +// boolean includeSuperClass = klass.getClassLoader() != null; +// +// Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods(); +// for (final Method method : methods) { +// final int modifiers = method.getModifiers(); +// if (Modifier.isPublic(modifiers) +// && !Modifier.isStatic(modifiers) +// && method.getParameterTypes().length == 0 +// && !method.isBridge() +// && method.getReturnType() != Void.TYPE +// && isValidMethodName(method.getName())) { +// final String key = getKeyNameFromMethod(method); +// if (key != null && !key.isEmpty()) { +// try { +// final Object result = method.invoke(bean); +// if (result != null) { +// // check cyclic dependency and throw error if needed +// // the wrap and populateMap combination method is +// // itself DFS recursive +// if (objectsRecord.contains(result)) { +// throw recursivelyDefinedObjectException(key); +// } +// +// objectsRecord.add(result); +// +// testValidity(result); +// this.map.put(key, wrap(result, objectsRecord)); +// +// objectsRecord.remove(result); +// +// // we don't use the result anywhere outside of wrap +// // if it's a resource we should be sure to close it +// // after calling toString +// if (result instanceof Closeable) { +// try { +// ((Closeable) result).close(); +// } catch (IOException ignore) { +// } +// } +// } +// } catch (IllegalAccessException ignore) { +// } catch (IllegalArgumentException ignore) { +// } catch (InvocationTargetException ignore) { +// } +// } +// } +// } +// } /** * Put a key/boolean pair in the JSONObject. diff --git a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java index 0b8e1f1a..e2fffcb5 100644 --- a/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java +++ b/src/protocol-game/java/net/lax1dude/eaglercraft/v1_8/socket/protocol/GamePluginMessageProtocol.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Supplier; import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.GameMessagePacket; import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.client.CPacketGetOtherCapeEAG; @@ -83,70 +84,116 @@ import net.lax1dude.eaglercraft.v1_8.socket.protocol.pkt.server.SPacketWebViewMe * */ public enum GamePluginMessageProtocol { - V3(3, define(V3_SKIN_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketGetOtherSkinEAG.class), - define(V3_SKIN_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketOtherSkinPresetEAG.class), - define(V3_SKIN_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketOtherSkinCustomV3EAG.class), - define(V3_SKIN_CHANNEL, 0x06, CLIENT_TO_SERVER, CPacketGetSkinByURLEAG.class), - define(V3_SKIN_CHANNEL, 0x07, CLIENT_TO_SERVER, CPacketInstallSkinSPEAG.class), - define(V3_CAPE_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketGetOtherCapeEAG.class), - define(V3_CAPE_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketOtherCapePresetEAG.class), - define(V3_CAPE_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketOtherCapeCustomEAG.class), - define(V3_VOICE_CHANNEL, 0x00, SERVER_TO_CLIENT, SPacketVoiceSignalAllowedEAG.class), - define(V3_VOICE_CHANNEL, 0x00, CLIENT_TO_SERVER, CPacketVoiceSignalRequestEAG.class), - define(V3_VOICE_CHANNEL, 0x01, CLIENT_TO_SERVER, CPacketVoiceSignalConnectEAG.class), - define(V3_VOICE_CHANNEL, 0x01, SERVER_TO_CLIENT, SPacketVoiceSignalConnectV3EAG.class), - define(V3_VOICE_CHANNEL, 0x02, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectV3EAG.class), - define(V3_VOICE_CHANNEL, 0x02, SERVER_TO_CLIENT, SPacketVoiceSignalDisconnectPeerEAG.class), - define(V3_VOICE_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketVoiceSignalICEEAG.class), - define(V3_VOICE_CHANNEL, 0x03, SERVER_TO_CLIENT, SPacketVoiceSignalICEEAG.class), - define(V3_VOICE_CHANNEL, 0x04, CLIENT_TO_SERVER, CPacketVoiceSignalDescEAG.class), - define(V3_VOICE_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketVoiceSignalDescEAG.class), - define(V3_VOICE_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketVoiceSignalGlobalEAG.class), - define(V3_UPDATE_CHANNEL, -1, SERVER_TO_CLIENT, SPacketUpdateCertEAG.class), - define(V3_FNAW_EN_CHANNEL, -1, SERVER_TO_CLIENT, SPacketEnableFNAWSkinsEAG.class)), - V4(4, define(V4_CHANNEL, 0x01, CLIENT_TO_SERVER, CPacketGetOtherSkinEAG.class), - define(V4_CHANNEL, 0x02, SERVER_TO_CLIENT, SPacketOtherSkinPresetEAG.class), - define(V4_CHANNEL, 0x03, SERVER_TO_CLIENT, SPacketOtherSkinCustomV4EAG.class), - define(V4_CHANNEL, 0x04, CLIENT_TO_SERVER, CPacketGetSkinByURLEAG.class), - define(V4_CHANNEL, 0x05, CLIENT_TO_SERVER, CPacketInstallSkinSPEAG.class), - define(V4_CHANNEL, 0x06, CLIENT_TO_SERVER, CPacketGetOtherCapeEAG.class), - define(V4_CHANNEL, 0x07, SERVER_TO_CLIENT, SPacketOtherCapePresetEAG.class), - define(V4_CHANNEL, 0x08, SERVER_TO_CLIENT, SPacketOtherCapeCustomEAG.class), - define(V4_CHANNEL, 0x09, SERVER_TO_CLIENT, SPacketVoiceSignalAllowedEAG.class), - define(V4_CHANNEL, 0x0A, CLIENT_TO_SERVER, CPacketVoiceSignalRequestEAG.class), - define(V4_CHANNEL, 0x0B, CLIENT_TO_SERVER, CPacketVoiceSignalConnectEAG.class), - define(V4_CHANNEL, 0x0C, SERVER_TO_CLIENT, SPacketVoiceSignalConnectV4EAG.class), - define(V4_CHANNEL, 0x0D, SERVER_TO_CLIENT, SPacketVoiceSignalConnectAnnounceV4EAG.class), - define(V4_CHANNEL, 0x0E, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectV4EAG.class), - define(V4_CHANNEL, 0x0F, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectPeerV4EAG.class), - define(V4_CHANNEL, 0x10, SERVER_TO_CLIENT, SPacketVoiceSignalDisconnectPeerEAG.class), - define(V4_CHANNEL, 0x11, CLIENT_TO_SERVER, CPacketVoiceSignalICEEAG.class), - define(V4_CHANNEL, 0x12, SERVER_TO_CLIENT, SPacketVoiceSignalICEEAG.class), - define(V4_CHANNEL, 0x13, CLIENT_TO_SERVER, CPacketVoiceSignalDescEAG.class), - define(V4_CHANNEL, 0x14, SERVER_TO_CLIENT, SPacketVoiceSignalDescEAG.class), - define(V4_CHANNEL, 0x15, SERVER_TO_CLIENT, SPacketVoiceSignalGlobalEAG.class), - define(V4_CHANNEL, 0x16, SERVER_TO_CLIENT, SPacketUpdateCertEAG.class), - define(V4_CHANNEL, 0x17, SERVER_TO_CLIENT, SPacketEnableFNAWSkinsEAG.class), - define(V4_CHANNEL, 0x18, SERVER_TO_CLIENT, SPacketForceClientSkinPresetV4EAG.class), - define(V4_CHANNEL, 0x19, SERVER_TO_CLIENT, SPacketForceClientSkinCustomV4EAG.class), - define(V4_CHANNEL, 0x1A, SERVER_TO_CLIENT, SPacketSetServerCookieV4EAG.class), - define(V4_CHANNEL, 0x1B, SERVER_TO_CLIENT, SPacketRedirectClientV4EAG.class), - define(V4_CHANNEL, 0x1C, CLIENT_TO_SERVER, CPacketGetOtherClientUUIDV4EAG.class), - define(V4_CHANNEL, 0x1D, SERVER_TO_CLIENT, SPacketOtherPlayerClientUUIDV4EAG.class), - define(V4_CHANNEL, 0x1E, SERVER_TO_CLIENT, SPacketForceClientCapePresetV4EAG.class), - define(V4_CHANNEL, 0x1F, SERVER_TO_CLIENT, SPacketForceClientCapeCustomV4EAG.class), - define(V4_CHANNEL, 0x20, SERVER_TO_CLIENT, SPacketInvalidatePlayerCacheV4EAG.class), - define(V4_CHANNEL, 0x21, SERVER_TO_CLIENT, SPacketUnforceClientV4EAG.class), - define(V4_CHANNEL, 0x22, SERVER_TO_CLIENT, SPacketCustomizePauseMenuV4EAG.class), - define(V4_CHANNEL, 0x23, CLIENT_TO_SERVER, CPacketRequestServerInfoV4EAG.class), - define(V4_CHANNEL, 0x24, SERVER_TO_CLIENT, SPacketServerInfoDataChunkV4EAG.class), - define(V4_CHANNEL, 0x25, CLIENT_TO_SERVER, CPacketWebViewMessageEnV4EAG.class), - define(V4_CHANNEL, 0x26, CLIENT_TO_SERVER, CPacketWebViewMessageV4EAG.class), - define(V4_CHANNEL, 0x27, SERVER_TO_CLIENT, SPacketWebViewMessageV4EAG.class), - define(V4_CHANNEL, 0x28, SERVER_TO_CLIENT, SPacketNotifIconsRegisterV4EAG.class), - define(V4_CHANNEL, 0x29, SERVER_TO_CLIENT, SPacketNotifIconsReleaseV4EAG.class), - define(V4_CHANNEL, 0x2A, SERVER_TO_CLIENT, SPacketNotifBadgeShowV4EAG.class), - define(V4_CHANNEL, 0x2B, SERVER_TO_CLIENT, SPacketNotifBadgeHideV4EAG.class)); + V3(3, define(V3_SKIN_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketGetOtherSkinEAG.class, CPacketGetOtherSkinEAG::new), + define(V3_SKIN_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketOtherSkinPresetEAG.class, + SPacketOtherSkinPresetEAG::new), + define(V3_SKIN_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketOtherSkinCustomV3EAG.class, + SPacketOtherSkinCustomV3EAG::new), + define(V3_SKIN_CHANNEL, 0x06, CLIENT_TO_SERVER, CPacketGetSkinByURLEAG.class, CPacketGetSkinByURLEAG::new), + define(V3_SKIN_CHANNEL, 0x07, CLIENT_TO_SERVER, CPacketInstallSkinSPEAG.class, + CPacketInstallSkinSPEAG::new), + define(V3_CAPE_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketGetOtherCapeEAG.class, CPacketGetOtherCapeEAG::new), + define(V3_CAPE_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketOtherCapePresetEAG.class, + SPacketOtherCapePresetEAG::new), + define(V3_CAPE_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketOtherCapeCustomEAG.class, + SPacketOtherCapeCustomEAG::new), + define(V3_VOICE_CHANNEL, 0x00, SERVER_TO_CLIENT, SPacketVoiceSignalAllowedEAG.class, + SPacketVoiceSignalAllowedEAG::new), + define(V3_VOICE_CHANNEL, 0x00, CLIENT_TO_SERVER, CPacketVoiceSignalRequestEAG.class, + CPacketVoiceSignalRequestEAG::new), + define(V3_VOICE_CHANNEL, 0x01, CLIENT_TO_SERVER, CPacketVoiceSignalConnectEAG.class, + CPacketVoiceSignalConnectEAG::new), + define(V3_VOICE_CHANNEL, 0x01, SERVER_TO_CLIENT, SPacketVoiceSignalConnectV3EAG.class, + SPacketVoiceSignalConnectV3EAG::new), + define(V3_VOICE_CHANNEL, 0x02, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectV3EAG.class, + CPacketVoiceSignalDisconnectV3EAG::new), + define(V3_VOICE_CHANNEL, 0x02, SERVER_TO_CLIENT, SPacketVoiceSignalDisconnectPeerEAG.class, + SPacketVoiceSignalDisconnectPeerEAG::new), + define(V3_VOICE_CHANNEL, 0x03, CLIENT_TO_SERVER, CPacketVoiceSignalICEEAG.class, + CPacketVoiceSignalICEEAG::new), + define(V3_VOICE_CHANNEL, 0x03, SERVER_TO_CLIENT, SPacketVoiceSignalICEEAG.class, + SPacketVoiceSignalICEEAG::new), + define(V3_VOICE_CHANNEL, 0x04, CLIENT_TO_SERVER, CPacketVoiceSignalDescEAG.class, + CPacketVoiceSignalDescEAG::new), + define(V3_VOICE_CHANNEL, 0x04, SERVER_TO_CLIENT, SPacketVoiceSignalDescEAG.class, + SPacketVoiceSignalDescEAG::new), + define(V3_VOICE_CHANNEL, 0x05, SERVER_TO_CLIENT, SPacketVoiceSignalGlobalEAG.class, + SPacketVoiceSignalGlobalEAG::new), + define(V3_UPDATE_CHANNEL, -1, SERVER_TO_CLIENT, SPacketUpdateCertEAG.class, SPacketUpdateCertEAG::new), + define(V3_FNAW_EN_CHANNEL, -1, SERVER_TO_CLIENT, SPacketEnableFNAWSkinsEAG.class, + SPacketEnableFNAWSkinsEAG::new)), + V4(4, define(V4_CHANNEL, 0x01, CLIENT_TO_SERVER, CPacketGetOtherSkinEAG.class, CPacketGetOtherSkinEAG::new), + define(V4_CHANNEL, 0x02, SERVER_TO_CLIENT, SPacketOtherSkinPresetEAG.class, SPacketOtherSkinPresetEAG::new), + define(V4_CHANNEL, 0x03, SERVER_TO_CLIENT, SPacketOtherSkinCustomV4EAG.class, + SPacketOtherSkinCustomV4EAG::new), + define(V4_CHANNEL, 0x04, CLIENT_TO_SERVER, CPacketGetSkinByURLEAG.class, CPacketGetSkinByURLEAG::new), + define(V4_CHANNEL, 0x05, CLIENT_TO_SERVER, CPacketInstallSkinSPEAG.class, CPacketInstallSkinSPEAG::new), + define(V4_CHANNEL, 0x06, CLIENT_TO_SERVER, CPacketGetOtherCapeEAG.class, CPacketGetOtherCapeEAG::new), + define(V4_CHANNEL, 0x07, SERVER_TO_CLIENT, SPacketOtherCapePresetEAG.class, SPacketOtherCapePresetEAG::new), + define(V4_CHANNEL, 0x08, SERVER_TO_CLIENT, SPacketOtherCapeCustomEAG.class, SPacketOtherCapeCustomEAG::new), + define(V4_CHANNEL, 0x09, SERVER_TO_CLIENT, SPacketVoiceSignalAllowedEAG.class, + SPacketVoiceSignalAllowedEAG::new), + define(V4_CHANNEL, 0x0A, CLIENT_TO_SERVER, CPacketVoiceSignalRequestEAG.class, + CPacketVoiceSignalRequestEAG::new), + define(V4_CHANNEL, 0x0B, CLIENT_TO_SERVER, CPacketVoiceSignalConnectEAG.class, + CPacketVoiceSignalConnectEAG::new), + define(V4_CHANNEL, 0x0C, SERVER_TO_CLIENT, SPacketVoiceSignalConnectV4EAG.class, + SPacketVoiceSignalConnectV4EAG::new), + define(V4_CHANNEL, 0x0D, SERVER_TO_CLIENT, SPacketVoiceSignalConnectAnnounceV4EAG.class, + SPacketVoiceSignalConnectAnnounceV4EAG::new), + define(V4_CHANNEL, 0x0E, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectV4EAG.class, + CPacketVoiceSignalDisconnectV4EAG::new), + define(V4_CHANNEL, 0x0F, CLIENT_TO_SERVER, CPacketVoiceSignalDisconnectPeerV4EAG.class, + CPacketVoiceSignalDisconnectPeerV4EAG::new), + define(V4_CHANNEL, 0x10, SERVER_TO_CLIENT, SPacketVoiceSignalDisconnectPeerEAG.class, + SPacketVoiceSignalDisconnectPeerEAG::new), + define(V4_CHANNEL, 0x11, CLIENT_TO_SERVER, CPacketVoiceSignalICEEAG.class, CPacketVoiceSignalICEEAG::new), + define(V4_CHANNEL, 0x12, SERVER_TO_CLIENT, SPacketVoiceSignalICEEAG.class, SPacketVoiceSignalICEEAG::new), + define(V4_CHANNEL, 0x13, CLIENT_TO_SERVER, CPacketVoiceSignalDescEAG.class, CPacketVoiceSignalDescEAG::new), + define(V4_CHANNEL, 0x14, SERVER_TO_CLIENT, SPacketVoiceSignalDescEAG.class, SPacketVoiceSignalDescEAG::new), + define(V4_CHANNEL, 0x15, SERVER_TO_CLIENT, SPacketVoiceSignalGlobalEAG.class, + SPacketVoiceSignalGlobalEAG::new), + define(V4_CHANNEL, 0x16, SERVER_TO_CLIENT, SPacketUpdateCertEAG.class, SPacketUpdateCertEAG::new), + define(V4_CHANNEL, 0x17, SERVER_TO_CLIENT, SPacketEnableFNAWSkinsEAG.class, SPacketEnableFNAWSkinsEAG::new), + define(V4_CHANNEL, 0x18, SERVER_TO_CLIENT, SPacketForceClientSkinPresetV4EAG.class, + SPacketForceClientSkinPresetV4EAG::new), + define(V4_CHANNEL, 0x19, SERVER_TO_CLIENT, SPacketForceClientSkinCustomV4EAG.class, + SPacketForceClientSkinCustomV4EAG::new), + define(V4_CHANNEL, 0x1A, SERVER_TO_CLIENT, SPacketSetServerCookieV4EAG.class, + SPacketSetServerCookieV4EAG::new), + define(V4_CHANNEL, 0x1B, SERVER_TO_CLIENT, SPacketRedirectClientV4EAG.class, + SPacketRedirectClientV4EAG::new), + define(V4_CHANNEL, 0x1C, CLIENT_TO_SERVER, CPacketGetOtherClientUUIDV4EAG.class, + CPacketGetOtherClientUUIDV4EAG::new), + define(V4_CHANNEL, 0x1D, SERVER_TO_CLIENT, SPacketOtherPlayerClientUUIDV4EAG.class, + SPacketOtherPlayerClientUUIDV4EAG::new), + define(V4_CHANNEL, 0x1E, SERVER_TO_CLIENT, SPacketForceClientCapePresetV4EAG.class, + SPacketForceClientCapePresetV4EAG::new), + define(V4_CHANNEL, 0x1F, SERVER_TO_CLIENT, SPacketForceClientCapeCustomV4EAG.class, + SPacketForceClientCapeCustomV4EAG::new), + define(V4_CHANNEL, 0x20, SERVER_TO_CLIENT, SPacketInvalidatePlayerCacheV4EAG.class, + SPacketInvalidatePlayerCacheV4EAG::new), + define(V4_CHANNEL, 0x21, SERVER_TO_CLIENT, SPacketUnforceClientV4EAG.class, SPacketUnforceClientV4EAG::new), + define(V4_CHANNEL, 0x22, SERVER_TO_CLIENT, SPacketCustomizePauseMenuV4EAG.class, + SPacketCustomizePauseMenuV4EAG::new), + define(V4_CHANNEL, 0x23, CLIENT_TO_SERVER, CPacketRequestServerInfoV4EAG.class, + CPacketRequestServerInfoV4EAG::new), + define(V4_CHANNEL, 0x24, SERVER_TO_CLIENT, SPacketServerInfoDataChunkV4EAG.class, + SPacketServerInfoDataChunkV4EAG::new), + define(V4_CHANNEL, 0x25, CLIENT_TO_SERVER, CPacketWebViewMessageEnV4EAG.class, + CPacketWebViewMessageEnV4EAG::new), + define(V4_CHANNEL, 0x26, CLIENT_TO_SERVER, CPacketWebViewMessageV4EAG.class, + CPacketWebViewMessageV4EAG::new), + define(V4_CHANNEL, 0x27, SERVER_TO_CLIENT, SPacketWebViewMessageV4EAG.class, + SPacketWebViewMessageV4EAG::new), + define(V4_CHANNEL, 0x28, SERVER_TO_CLIENT, SPacketNotifIconsRegisterV4EAG.class, + SPacketNotifIconsRegisterV4EAG::new), + define(V4_CHANNEL, 0x29, SERVER_TO_CLIENT, SPacketNotifIconsReleaseV4EAG.class, + SPacketNotifIconsReleaseV4EAG::new), + define(V4_CHANNEL, 0x2A, SERVER_TO_CLIENT, SPacketNotifBadgeShowV4EAG.class, + SPacketNotifBadgeShowV4EAG::new), + define(V4_CHANNEL, 0x2B, SERVER_TO_CLIENT, SPacketNotifBadgeHideV4EAG.class, + SPacketNotifBadgeHideV4EAG::new)); private static class PacketDef { @@ -154,12 +201,15 @@ public enum GamePluginMessageProtocol { private final int id; private final int dir; private final Class clazz; + private final Supplier ctor; - private PacketDef(String channel, int id, int dir, Class clazz) { + private PacketDef(String channel, int id, int dir, Class clazz, + Supplier ctor) { this.channel = channel; this.id = id; this.dir = dir; this.clazz = clazz; + this.ctor = ctor; } } @@ -183,8 +233,9 @@ public enum GamePluginMessageProtocol { } } - private static PacketDef define(String channel, int id, int dir, Class clazz) { - return new PacketDef(channel, id, dir, clazz); + private static PacketDef define(String channel, int id, int dir, Class clazz, + Supplier ctor) { + return new PacketDef(channel, id, dir, clazz, ctor); } public static Set getAllChannels() { @@ -256,12 +307,7 @@ public enum GamePluginMessageProtocol { throw new IOException("[" + channel + "] Unknown packet ID: " + pktId); } } - GameMessagePacket ret; - try { - ret = toRead.clazz.newInstance(); - } catch (Throwable t) { - throw new RuntimeException("Reflection failed to call packet constructor! (Is it defined?)", t); - } + GameMessagePacket ret = toRead.ctor.get(); ret.readPacket(buffer); return ret; } diff --git a/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java index 5fbb9d68..7d75820e 100644 --- a/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java +++ b/src/protocol-relay/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/RelayPacket.java @@ -9,6 +9,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.HashMap; import java.util.Map; +import java.util.function.Supplier; /** * Copyright (c) 2022-2024 lax1dude. All Rights Reserved. @@ -29,21 +30,22 @@ import java.util.Map; public class RelayPacket { private static final Map> definedPacketClasses = new HashMap<>(); + private static final Map> definedPacketCtors = new HashMap<>(); private static final Map, Integer> definedPacketIds = new HashMap<>(); static { - register(0x00, RelayPacket00Handshake.class); - register(0x01, RelayPacket01ICEServers.class); - register(0x02, RelayPacket02NewClient.class); - register(0x03, RelayPacket03ICECandidate.class); - register(0x04, RelayPacket04Description.class); - register(0x05, RelayPacket05ClientSuccess.class); - register(0x06, RelayPacket06ClientFailure.class); - register(0x07, RelayPacket07LocalWorlds.class); - register(0x69, RelayPacket69Pong.class); - register(0x70, RelayPacket70SpecialUpdate.class); - register(0xFE, RelayPacketFEDisconnectClient.class); - register(0xFF, RelayPacketFFErrorCode.class); + register(0x00, RelayPacket00Handshake.class, RelayPacket00Handshake::new); + register(0x01, RelayPacket01ICEServers.class, RelayPacket01ICEServers::new); + register(0x02, RelayPacket02NewClient.class, RelayPacket02NewClient::new); + register(0x03, RelayPacket03ICECandidate.class, RelayPacket03ICECandidate::new); + register(0x04, RelayPacket04Description.class, RelayPacket04Description::new); + register(0x05, RelayPacket05ClientSuccess.class, RelayPacket05ClientSuccess::new); + register(0x06, RelayPacket06ClientFailure.class, RelayPacket06ClientFailure::new); + register(0x07, RelayPacket07LocalWorlds.class, RelayPacket07LocalWorlds::new); + register(0x69, RelayPacket69Pong.class, RelayPacket69Pong::new); + register(0x70, RelayPacket70SpecialUpdate.class, RelayPacket70SpecialUpdate::new); + register(0xFE, RelayPacketFEDisconnectClient.class, RelayPacketFEDisconnectClient::new); + register(0xFF, RelayPacketFFErrorCode.class, RelayPacketFFErrorCode::new); } public static String readASCII(InputStream is, int len) throws IOException { @@ -91,27 +93,22 @@ public class RelayPacket { public static RelayPacket readPacket(DataInputStream input, IRelayLogger logger) throws IOException { int i = input.read(); - try { - Class clazz = definedPacketClasses.get(i); - if (clazz == null) { - throw new IOException("Unknown packet type: " + i); - } - RelayPacket pkt = clazz.newInstance(); - pkt.read(input); - int j = input.available(); - if (j > 0) { - throw new IOException("Packet type " + i + " had " + j + " remaining bytes"); - } - return pkt; - } catch (InstantiationException | IllegalAccessException e) { - logger.error("Could not instanciate packet {}", i); - logger.error(e); + Supplier ctor = definedPacketCtors.get(i); + if (ctor == null) { throw new IOException("Unknown packet type: " + i); } + RelayPacket pkt = ctor.get(); + pkt.read(input); + int j = input.available(); + if (j > 0) { + throw new IOException("Packet type " + i + " had " + j + " remaining bytes"); + } + return pkt; } - private static void register(int id, Class clazz) { + private static void register(int id, Class clazz, Supplier ctor) { definedPacketClasses.put(id, clazz); + definedPacketCtors.put(id, ctor); definedPacketIds.put(clazz, id); } diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java index f7f4f60b..545ffcbe 100644 --- a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java +++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuMain.java @@ -171,7 +171,7 @@ public class BootMenuMain { } } } - EagUtils.sleep(50l); + EagUtils.sleep(50); } } diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java index 9f74c45a..5fa269a5 100644 --- a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java +++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/ClientBootFactory.java @@ -242,7 +242,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMain("eaglercraftXOpts", launchOptsStr, "main", blockUnsigned); @@ -409,7 +409,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMain("eaglercraftOpts", launchOptsStr, "main", blockUnsigned); @@ -464,7 +464,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMainOld15("minecraftOpts", container, assetsEPKURL.toExternalForm(), b64Opts, launchConf.joinServer, "main", blockUnsigned); @@ -538,7 +538,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMainOldB13("minecraftOpts", container, assetsEPKURL.toExternalForm(), launchConf.joinServer, "main", blockUnsigned); @@ -595,7 +595,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMain("config", launchOptsStr, "main", blockUnsigned); @@ -649,7 +649,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMainOldB13("classicConfig", container, assetsEPKURL.toExternalForm(), "", "main", blockUnsigned); @@ -710,7 +710,7 @@ public class ClientBootFactory { BootMenuMain.runLater(() -> { while(!isMainReady("main")) { logger.error("main function is not available yet! waiting 250ms..."); - EagUtils.sleep(250l); + EagUtils.sleep(250); } BootMenuMain.stopEventLoop(); callMain(launchConf.launchOptsVar, launchOptsStr, launchConf.mainFunction, blockUnsigned); diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java index 6c6564d2..084b3751 100644 --- a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java +++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuPopupStateLoading.java @@ -87,7 +87,7 @@ public class MenuPopupStateLoading extends MenuState implements IProgressMsgCall public void updateMessage(String msg) { this.msg = msg; BootMenuMain.bootMenuDOM.popup_confirm_title.setInnerText(!StringUtils.isAllEmpty(msg) ? (text + "\n\n" + msg) : text); - EagUtils.sleep(50l); + EagUtils.sleep(50); } @Override diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java index 62b5d60f..ef1925e4 100644 --- a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java +++ b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/MenuStateBoot.java @@ -279,7 +279,7 @@ public class MenuStateBoot extends MenuState { if(res != null) { MenuPopupStateLoading loadingScreen = new MenuPopupStateLoading("Importing client..."); MenuStateBoot.this.changePopupState(loadingScreen); - EagUtils.sleep(50l); + EagUtils.sleep(50); String offlineData = new String(res.fileData, StandardCharsets.UTF_8).replace("\r\n", "\n"); EnumOfflineParseType parseType2 = parseTypeF; if(parseType2 == null) { diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java index b0917df4..6806aa8d 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java @@ -117,7 +117,7 @@ public class PlatformApplication { @JSBody(params = { "cb" }, script = "if(!navigator.clipboard) { cb(prompt(\"Please enter the text to paste:\") || \"\"); } else if (!navigator.clipboard.readText) cb(\"\"); else navigator.clipboard.readText().then(function(s) { cb(s); }, function(s) { cb(\"\"); });") private static native void getClipboard1(StupidFunctionResolveString cb); - @JSBody(params = { "str" }, script = "if(navigator.clipboard) clipboard.writeText(str);") + @JSBody(params = { "str" }, script = "if(navigator.clipboard) navigator.clipboard.writeText(str);") private static native void setClipboard0(String str); public static void setLocalStorage(String name, byte[] data) { diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java index 622f16a2..7f878cbf 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java @@ -119,6 +119,7 @@ public class PlatformAudio { public void restart() { if(isEnded) { isEnded = false; + isPaused = false; AudioBufferSourceNode src = audioctx.createBufferSource(); resource.cacheHit = PlatformRuntime.steadyTimeMillis(); src.setBuffer(resource.buffer); @@ -302,13 +303,11 @@ public class PlatformAudio { } gameRecGain = audioctx.createGain(); gameRecGain.getGain().setValue(gameVol); - synchronized(activeSounds) { - for(BrowserAudioHandle handle : activeSounds) { - if(handle.panner != null) { - handle.panner.connect(gameRecGain); - }else { - handle.gain.connect(gameRecGain); - } + for(BrowserAudioHandle handle : activeSounds) { + if(handle.panner != null) { + handle.panner.connect(gameRecGain); + }else { + handle.gain.connect(gameRecGain); } } PlatformVoiceClient.addRecordingDest(gameRecGain); @@ -341,16 +340,14 @@ public class PlatformAudio { gameRecGain.disconnect(); }catch(Throwable t) { } - synchronized(activeSounds) { - for(BrowserAudioHandle handle : activeSounds) { - try { - if(handle.panner != null) { - handle.panner.disconnect(gameRecGain); - }else { - handle.gain.disconnect(gameRecGain); - } - }catch(Throwable t) { + for(BrowserAudioHandle handle : activeSounds) { + try { + if(handle.panner != null) { + handle.panner.disconnect(gameRecGain); + }else { + handle.gain.disconnect(gameRecGain); } + }catch(Throwable t) { } } PlatformVoiceClient.removeRecordingDest(gameRecGain); @@ -361,18 +358,13 @@ public class PlatformAudio { } public static IAudioResource loadAudioData(String filename, boolean holdInCache) { - BrowserAudioResource buffer; - synchronized(soundCache) { - buffer = soundCache.get(filename); - } + BrowserAudioResource buffer = soundCache.get(filename); if(buffer == null) { byte[] file = PlatformAssets.getResourceBytes(filename); if(file == null) return null; buffer = new BrowserAudioResource(decodeAudioData(file, filename)); if(holdInCache) { - synchronized(soundCache) { - soundCache.put(filename, buffer); - } + soundCache.put(filename, buffer); } } if(buffer.buffer != null) { @@ -383,23 +375,14 @@ public class PlatformAudio { } } - public static interface IAudioCacheLoader { - byte[] loadFile(String filename); - } - public static IAudioResource loadAudioDataNew(String filename, boolean holdInCache, IAudioCacheLoader loader) { - BrowserAudioResource buffer; - synchronized(soundCache) { - buffer = soundCache.get(filename); - } + BrowserAudioResource buffer = soundCache.get(filename); if(buffer == null) { byte[] file = loader.loadFile(filename); if(file == null) return null; buffer = new BrowserAudioResource(decodeAudioData(file, filename)); if(holdInCache) { - synchronized(soundCache) { - soundCache.put(filename, buffer); - } + soundCache.put(filename, buffer); } } if(buffer.buffer != null) { @@ -457,35 +440,27 @@ public class PlatformAudio { long millis = PlatformRuntime.steadyTimeMillis(); if(millis - cacheFreeTimer > 30000l) { cacheFreeTimer = millis; - synchronized(soundCache) { - Iterator itr = soundCache.values().iterator(); - while(itr.hasNext()) { - if(millis - itr.next().cacheHit > 600000l) { // 10 minutes - itr.remove(); - } + Iterator itr = soundCache.values().iterator(); + while(itr.hasNext()) { + if(millis - itr.next().cacheHit > 600000l) { // 10 minutes + itr.remove(); } } } if(millis - activeFreeTimer > 700l) { activeFreeTimer = millis; - synchronized(activeSounds) { - Iterator itr = activeSounds.iterator(); - while(itr.hasNext()) { - if(itr.next().shouldFree()) { - itr.remove(); - } + Iterator itr = activeSounds.iterator(); + while(itr.hasNext()) { + if(itr.next().shouldFree()) { + itr.remove(); } } } } public static void flushAudioCache() { - synchronized(soundCache) { - soundCache.clear(); - } - synchronized(activeSounds) { - activeSounds.clear(); - } + soundCache.clear(); + activeSounds.clear(); } public static boolean available() { @@ -529,9 +504,7 @@ public class PlatformAudio { src.start(); BrowserAudioHandle ret = new BrowserAudioHandle(internalTrack, src, panner, gain, pitch); - synchronized(activeSounds) { - activeSounds.add(ret); - } + activeSounds.add(ret); return ret; } @@ -557,9 +530,7 @@ public class PlatformAudio { src.start(); BrowserAudioHandle ret = new BrowserAudioHandle(internalTrack, src, null, gain, pitch); - synchronized(activeSounds) { - activeSounds.add(ret); - } + activeSounds.add(ret); return ret; } @@ -574,7 +545,7 @@ public class PlatformAudio { } static void destroy() { - soundCache.clear(); + flushAudioCache(); if(audioctx != null) { audioctx.close(); audioctx = null; diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java index 8d46ddff..585ca93b 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java @@ -37,6 +37,7 @@ import org.teavm.jso.gamepad.Gamepad; import org.teavm.jso.gamepad.GamepadButton; import org.teavm.jso.gamepad.GamepadEvent; +import net.lax1dude.eaglercraft.v1_8.Display; import net.lax1dude.eaglercraft.v1_8.EagUtils; import net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain; import net.lax1dude.eaglercraft.v1_8.internal.teavm.EarlyLoadScreen; @@ -883,6 +884,12 @@ public class PlatformInput { static native double getDevicePixelRatio(Window win); public static void update() { + update(0); + } + + private static final long[] syncTimer = new long[1]; + + public static void update(int fpsLimit) { double r = getDevicePixelRatio(win); if(r < 0.01) r = 1.0; windowDPI = (float)r; @@ -934,12 +941,21 @@ public class PlatformInput { PlatformScreenRecord.captureFrameHook(); if(getVisibilityState(win.getDocument())) { if(vsyncSupport && vsync) { + syncTimer[0] = 0l; asyncRequestAnimationFrame(); }else { - PlatformRuntime.swapDelayTeaVM(); + if(fpsLimit <= 0) { + syncTimer[0] = 0l; + PlatformRuntime.swapDelayTeaVM(); + }else { + if(!Display.sync(fpsLimit, syncTimer)) { + PlatformRuntime.swapDelayTeaVM(); + } + } } }else { - EagUtils.sleep(50l); + syncTimer[0] = 0l; + EagUtils.sleep(50); } } @@ -1177,6 +1193,10 @@ public class PlatformInput { enableRepeatEvents = b; } + public static boolean keyboardAreKeysLocked() { + return lockKeys; + } + public static boolean mouseNext() { currentEvent = null; synchronized(mouseEvents) { @@ -1262,7 +1282,7 @@ public class PlatformInput { } public static boolean mouseIsButtonDown(int i) { - return buttonStates[i]; + return (i < 0 || i >= buttonStates.length) ? false : buttonStates[i]; } public static int mouseGetDWheel() { @@ -1553,7 +1573,7 @@ public class PlatformInput { EarlyLoadScreen.paintEnable(PlatformOpenGL.checkVAOCapable(), allowBootMenu); while(mouseEvents.isEmpty() && keyEvents.isEmpty() && touchEvents.isEmpty()) { - EagUtils.sleep(100l); + EagUtils.sleep(100); } } } @@ -1720,13 +1740,13 @@ public class PlatformInput { } @JSBody(params = { "doc" }, script = "doc.exitFullscreen();") - private static native void exitFullscreen(HTMLDocument doc); + private static native void exitFullscreen(HTMLDocument doc); @JSBody(params = { "doc" }, script = "doc.webkitExitFullscreen();") - private static native void webkitExitFullscreen(HTMLDocument doc); + private static native void webkitExitFullscreen(HTMLDocument doc); @JSBody(params = { "doc" }, script = "doc.mozCancelFullscreen();") - private static native void mozCancelFullscreen(HTMLDocument doc); + private static native void mozCancelFullscreen(HTMLDocument doc); public static void showCursor(EnumCursorType cursor) { switch(cursor) { @@ -1843,20 +1863,13 @@ public class PlatformInput { return ret != null ? ret.intValue() : -1; }; - public static void touchBufferFlush() { - pointerLockSupported = 0; - pointerLockFlag = true; - currentTouchState = null; - touchEvents.clear(); - } - // Note: this can't be called from the main loop, don't try private static void touchOpenDeviceKeyboard() { if(!touchIsDeviceKeyboardOpenMAYBE()) { if(touchKeyboardField != null) { touchKeyboardField.blur(); touchKeyboardField.setValue(""); - EagUtils.sleep(10l); + EagUtils.sleep(10); if(touchKeyboardForm != null) { touchKeyboardForm.removeChild(touchKeyboardField); }else { @@ -2127,7 +2140,7 @@ public class PlatformInput { touchKeyboardField.blur(); touchKeyboardField.setValue(""); if(sync) { - EagUtils.sleep(10l); + EagUtils.sleep(10); if(touchKeyboardForm != null) { touchKeyboardForm.removeChild(touchKeyboardField); }else { diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java index fe6d6032..bc40081b 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java @@ -469,10 +469,10 @@ public class PlatformOpenGL { data == null ? null : EaglerArrayBufferAllocator.getDataView8Unsigned(data)); } - public static final void _wglTexImage2D(int target, int level, int internalFormat, int width, + public static final void _wglTexImage2Df32(int target, int level, int internalFormat, int width, int height, int border, int format, int type, FloatBuffer data) { ctx.texImage2D(target, level, internalFormat, width, height, border, format, type, - data == null ? null : EaglerArrayBufferAllocator.getDataView8Unsigned(data)); + data == null ? null : EaglerArrayBufferAllocator.getDataView32F(data)); } public static final void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset, @@ -493,10 +493,10 @@ public class PlatformOpenGL { data == null ? null : EaglerArrayBufferAllocator.getDataView8Unsigned(data)); } - public static final void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset, + public static final void _wglTexSubImage2Df32(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, FloatBuffer data) { ctx.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, - data == null ? null : EaglerArrayBufferAllocator.getDataView8Unsigned(data)); + data == null ? null : EaglerArrayBufferAllocator.getDataView32F(data)); } public static final void _wglCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, @@ -517,19 +517,19 @@ public class PlatformOpenGL { } public static final void _wglShaderSource(IShaderGL obj, String source) { - ctx.shaderSource(obj == null ? null : ((OpenGLObjects.ShaderGL)obj).ptr, source); + ctx.shaderSource(((OpenGLObjects.ShaderGL)obj).ptr, source); } public static final void _wglCompileShader(IShaderGL obj) { - ctx.compileShader(obj == null ? null : ((OpenGLObjects.ShaderGL)obj).ptr); + ctx.compileShader(((OpenGLObjects.ShaderGL)obj).ptr); } public static final int _wglGetShaderi(IShaderGL obj, int param) { - return ctx.getShaderParameteri(obj == null ? null : ((OpenGLObjects.ShaderGL)obj).ptr, param); + return ctx.getShaderParameteri(((OpenGLObjects.ShaderGL)obj).ptr, param); } public static final String _wglGetShaderInfoLog(IShaderGL obj) { - return ctx.getShaderInfoLog(obj == null ? null : ((OpenGLObjects.ShaderGL)obj).ptr); + return ctx.getShaderInfoLog(((OpenGLObjects.ShaderGL)obj).ptr); } public static final void _wglUseProgram(IProgramGL obj) { @@ -537,33 +537,31 @@ public class PlatformOpenGL { } public static final void _wglAttachShader(IProgramGL obj, IShaderGL shader) { - ctx.attachShader(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr, - shader == null ? null : ((OpenGLObjects.ShaderGL)shader).ptr); + ctx.attachShader(((OpenGLObjects.ProgramGL)obj).ptr, ((OpenGLObjects.ShaderGL)shader).ptr); } public static final void _wglDetachShader(IProgramGL obj, IShaderGL shader) { - ctx.detachShader(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr, - shader == null ? null : ((OpenGLObjects.ShaderGL)shader).ptr); + ctx.detachShader(((OpenGLObjects.ProgramGL)obj).ptr, ((OpenGLObjects.ShaderGL)shader).ptr); } public static final void _wglLinkProgram(IProgramGL obj) { - ctx.linkProgram(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr); + ctx.linkProgram(((OpenGLObjects.ProgramGL)obj).ptr); } public static final int _wglGetProgrami(IProgramGL obj, int param) { - return ctx.getProgramParameteri(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr, param); + return ctx.getProgramParameteri(((OpenGLObjects.ProgramGL)obj).ptr, param); } public static final String _wglGetProgramInfoLog(IProgramGL obj) { - return ctx.getProgramInfoLog(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr); + return ctx.getProgramInfoLog(((OpenGLObjects.ProgramGL)obj).ptr); } public static final void _wglBindAttribLocation(IProgramGL obj, int index, String name) { - ctx.bindAttribLocation(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr, index, name); + ctx.bindAttribLocation(((OpenGLObjects.ProgramGL)obj).ptr, index, name); } public static final int _wglGetAttribLocation(IProgramGL obj, String name) { - return ctx.getAttribLocation(obj == null ? null : ((OpenGLObjects.ProgramGL)obj).ptr, name); + return ctx.getAttribLocation(((OpenGLObjects.ProgramGL)obj).ptr, name); } public static final void _wglDrawArrays(int mode, int first, int count) { @@ -571,13 +569,13 @@ public class PlatformOpenGL { //checkErr("_wglDrawArrays(" + mode + ", " + first + ", " + count + ");"); } - public static final void _wglDrawArraysInstanced(int mode, int first, int count, int instanced) { + public static final void _wglDrawArraysInstanced(int mode, int first, int count, int instances) { switch(instancingImpl) { case INSTANCE_IMPL_CORE: - ctx.drawArraysInstanced(mode, first, count, instanced); + ctx.drawArraysInstanced(mode, first, count, instances); break; case INSTANCE_IMPL_ANGLE: - ANGLEInstancedArrays.drawArraysInstancedANGLE(mode, first, count, instanced); + ANGLEInstancedArrays.drawArraysInstancedANGLE(mode, first, count, instances); break; default: throw new UnsupportedOperationException(); @@ -590,13 +588,13 @@ public class PlatformOpenGL { //checkErr("_wglDrawElements(" + mode + ", " + count + ", " + type + ", " + offset + ");"); } - public static final void _wglDrawElementsInstanced(int mode, int count, int type, int offset, int instanced) { + public static final void _wglDrawElementsInstanced(int mode, int count, int type, int offset, int instances) { switch(instancingImpl) { case INSTANCE_IMPL_CORE: - ctx.drawElementsInstanced(mode, count, type, offset, instanced); + ctx.drawElementsInstanced(mode, count, type, offset, instances); break; case INSTANCE_IMPL_ANGLE: - ANGLEInstancedArrays.drawElementsInstancedANGLE(mode, count, type, offset, instanced); + ANGLEInstancedArrays.drawElementsInstancedANGLE(mode, count, type, offset, instances); break; default: throw new UnsupportedOperationException(); @@ -708,13 +706,11 @@ public class PlatformOpenGL { public static final void _wglFramebufferTexture2D(int target, int attachment, int texTarget, ITextureGL texture, int level) { - ctx.framebufferTexture2D(target, attachment, texTarget, - texture == null ? null : ((OpenGLObjects.TextureGL)texture).ptr, level); + ctx.framebufferTexture2D(target, attachment, texTarget, ((OpenGLObjects.TextureGL)texture).ptr, level); } public static final void _wglFramebufferTextureLayer(int target, int attachment, ITextureGL texture, int level, int layer) { - ctx.framebufferTextureLayer(target, attachment, - texture == null ? null : ((OpenGLObjects.TextureGL) texture).ptr, level, layer); + ctx.framebufferTextureLayer(target, attachment, ((OpenGLObjects.TextureGL) texture).ptr, level, layer); } public static final void _wglBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java index 60564210..5c85123e 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java @@ -12,7 +12,6 @@ import java.util.Set; import java.util.function.Consumer; import net.lax1dude.eaglercraft.v1_8.EagRuntime; -import net.lax1dude.eaglercraft.v1_8.EagUtils; import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; import net.lax1dude.eaglercraft.v1_8.Filesystem; @@ -37,6 +36,8 @@ import org.teavm.jso.dom.xml.Node; import org.teavm.jso.dom.xml.NodeList; import org.teavm.jso.typedarrays.ArrayBuffer; import org.teavm.jso.webgl.WebGLFramebuffer; +import org.teavm.platform.Platform; +import org.teavm.platform.PlatformRunnable; import com.google.common.collect.Collections2; import com.google.common.collect.Iterators; @@ -172,11 +173,12 @@ public class PlatformRuntime { logger.info("Creating main game canvas"); root = doc.getElementById(ClientMain.configRootElementId); - root.getClassList().add("_eaglercraftX_root_element"); if(root == null) { throw new RuntimeInitializationFailureException("Root element \"" + ClientMain.configRootElementId + "\" was not found in this document!"); } - + + root.getClassList().add("_eaglercraftX_root_element"); + Node nodeler; while((nodeler = root.getLastChild()) != null && TeaVMUtils.isTruthy(nodeler)) { root.removeChild(nodeler); @@ -748,7 +750,7 @@ public class PlatformRuntime { if(!useDelayOnSwap && immediateContinueSupport) { immediateContinueTeaVM0(); }else { - EagUtils.sleep(0l); + sleep(0); } } @@ -756,7 +758,7 @@ public class PlatformRuntime { if(immediateContinueSupport) { immediateContinueTeaVM0(); }else { - EagUtils.sleep(0l); + sleep(0); } } @@ -890,7 +892,7 @@ public class PlatformRuntime { immediateContinueChannel = null; return IMMEDIATE_CONT_FAILED_NOT_ASYNC; } - EagUtils.sleep(10l); + sleep(10); currentMsgChannelContinueHack = null; if(!checkMe[0]) { if(immediateContinueChannel != null) { @@ -945,7 +947,7 @@ public class PlatformRuntime { currentLegacyContinueHack = null; return IMMEDIATE_CONT_FAILED_NOT_ASYNC; } - EagUtils.sleep(10l); + sleep(10); currentLegacyContinueHack = null; if(!checkMe[0]) { return IMMEDIATE_CONT_FAILED_NOT_CONT; @@ -1103,6 +1105,24 @@ public class PlatformRuntime { return (long)(steadyTimeMillis0(steadyTimeFunc) * 1000000.0); } + @Async + public static native void sleep(int millis); + + private static void sleep(int millis, final AsyncCallback callback) { + Platform.schedule(new DumbSleepHandler(callback), millis); + } + + private static class DumbSleepHandler implements PlatformRunnable { + private final AsyncCallback callback; + private DumbSleepHandler(AsyncCallback callback) { + this.callback = callback; + } + @Override + public void run() { + callback.complete(null); + } + } + static void checkBootMenu() { while(PlatformInput.keyboardNext()) { if(PlatformInput.keyboardGetEventKeyState()) { diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java index 6631f116..70a92277 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformScreenRecord.java @@ -2,6 +2,7 @@ package net.lax1dude.eaglercraft.v1_8.internal; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.EnumSet; import java.util.HashSet; import java.util.Set; @@ -49,7 +50,7 @@ public class PlatformScreenRecord { static Window win; static HTMLCanvasElement canvas; static boolean support; - static final Set supportedCodecs = new HashSet<>(); + static final Set supportedCodecs = EnumSet.noneOf(EnumScreenRecordingCodec.class); static float currentGameVolume = 1.0f; static float currentMicVolume = 0.0f; static MediaStream recStream = null; diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java index 40993f11..f692fabe 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java @@ -218,7 +218,7 @@ public class ClientMain { systemOut.println("ClientMain: [INFO] launching eaglercraftx main thread"); try { - Main.appMain(new String[0]); + Main.appMain(); }catch(Throwable t) { systemErr.println("ClientMain: [ERROR] unhandled exception caused main thread to exit"); EagRuntime.debugPrintStackTraceToSTDERR(t); diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java index 40e2dfd5..69f6b973 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java @@ -199,7 +199,7 @@ public class EarlyLoadScreen { _wglDisableVertexAttribArray(0); PlatformInput.update(); - EagUtils.sleep(50l); // allow webgl to flush + EagUtils.sleep(50); // allow webgl to flush _wglUseProgram(null); _wglBindBuffer(GL_ARRAY_BUFFER, null); @@ -266,7 +266,7 @@ public class EarlyLoadScreen { _wglDisableVertexAttribArray(0); PlatformInput.update(); - EagUtils.sleep(50l); // allow webgl to flush + EagUtils.sleep(50); // allow webgl to flush _wglUseProgram(null); _wglBindBuffer(GL_ARRAY_BUFFER, null); @@ -351,7 +351,7 @@ public class EarlyLoadScreen { } PlatformInput.update(); - EagUtils.sleep(50l); // allow webgl to flush + EagUtils.sleep(50); // allow webgl to flush _wglUseProgram(null); if(!(vaos && softVAOs)) { diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java index c0558335..9a418fdf 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/JOrbisAudioBufferDecoder.java @@ -90,8 +90,8 @@ public class JOrbisAudioBufferDecoder { logger.warn("[{}]: Number of channels in header does not match the stream", errorString); } if(ch == -1 || len == 0) { - logger.warn("[{}]: Empty file", errorString); - return ctx.createBuffer(ch, 0, dec.jorbisInfo.rate); + logger.error("[{}]: Empty file", errorString); + return null; } switch(loadVia) { case LOAD_VIA_AUDIOBUFFER: { diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java index deff6322..d8e5c14e 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java @@ -47,16 +47,17 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenu private String worldsDB = "worlds_starlike"; private String resourcePacksDB = "resourcePacks_starlike"; private JSONObject integratedServerOpts; + private boolean checkGLErrors = false; private boolean checkShaderGLErrors = false; private boolean demoMode = EaglercraftVersion.forceDemoMode; private boolean isAllowUpdateSvc = EaglercraftVersion.enableUpdateService; private boolean isAllowUpdateDL = EaglercraftVersion.enableUpdateService; private boolean isEnableDownloadOfflineButton = true; - private String downloadOfflineButtonLink = "https://starlike.orionzleon.me/offline.html"; - private boolean useSpecialCursors = true; + private String downloadOfflineButtonLink = null; + private boolean useSpecialCursors = false; private boolean logInvalidCerts = true; private boolean checkRelaysForUpdates = true; - private boolean enableSignatureBadge = true; + private boolean enableSignatureBadge = false; private boolean allowVoiceClient = true; private boolean allowFNAWSkins = true; private String localStorageNamespace = "_eaglercraftX_starlike"; @@ -97,15 +98,16 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenu serverToJoin = eaglercraftXOpts.getJoinServer(null); worldsDB = eaglercraftXOpts.getWorldsDB("worlds_starlike"); resourcePacksDB = eaglercraftXOpts.getResourcePacksDB("resourcePacks_starlike"); + checkGLErrors = eaglercraftXOpts.getCheckGLErrors(false); checkShaderGLErrors = eaglercraftXOpts.getCheckShaderGLErrors(false); demoMode = EaglercraftVersion.forceDemoMode || eaglercraftXOpts.getDemoMode(false); isAllowUpdateSvc = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftXOpts.getAllowUpdateSvc(true); isAllowUpdateDL = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftXOpts.getAllowUpdateDL(true); isEnableDownloadOfflineButton = eaglercraftXOpts.getEnableDownloadOfflineButton(true); - downloadOfflineButtonLink = eaglercraftXOpts.getDownloadOfflineButtonLink("https://starlike.orionzleon.me/offline.html"); - useSpecialCursors = eaglercraftXOpts.getHtml5CursorSupport(true); + downloadOfflineButtonLink = eaglercraftXOpts.getDownloadOfflineButtonLink(null); + useSpecialCursors = eaglercraftXOpts.getHtml5CursorSupport(false); logInvalidCerts = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftXOpts.getLogInvalidCerts(true); - enableSignatureBadge = eaglercraftXOpts.getEnableSignatureBadge(true); + enableSignatureBadge = eaglercraftXOpts.getEnableSignatureBadge(false); allowVoiceClient = eaglercraftXOpts.getAllowVoiceClient(true); allowFNAWSkins = !demoMode && eaglercraftXOpts.getAllowFNAWSkins(true); localStorageNamespace = eaglercraftXOpts.getLocalStorageNamespace(EaglercraftVersion.localStorageNamespace); @@ -224,6 +226,7 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenu serverToJoin = eaglercraftOpts.optString("joinServer", null); worldsDB = eaglercraftOpts.optString("worldsDB", "worlds_starlike"); resourcePacksDB = eaglercraftOpts.optString("resourcePacksDB", "resourcePacks_starlike"); + checkGLErrors = eaglercraftOpts.optBoolean("checkGLErrors", false); checkShaderGLErrors = eaglercraftOpts.optBoolean("checkShaderGLErrors", false); if(EaglercraftVersion.forceDemoMode) { eaglercraftOpts.put("demoMode", true); @@ -232,10 +235,10 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenu isAllowUpdateSvc = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftOpts.optBoolean("allowUpdateSvc", true); isAllowUpdateDL = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftOpts.optBoolean("allowUpdateDL", true); isEnableDownloadOfflineButton = eaglercraftOpts.optBoolean("enableDownloadOfflineButton", true); - downloadOfflineButtonLink = eaglercraftOpts.optString("downloadOfflineButtonLink", "https://starlike.orionzleon.me/offline.html"); - useSpecialCursors = eaglercraftOpts.optBoolean("html5CursorSupport", true); + downloadOfflineButtonLink = eaglercraftOpts.optString("downloadOfflineButtonLink", null); + useSpecialCursors = eaglercraftOpts.optBoolean("html5CursorSupport", false); logInvalidCerts = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftOpts.optBoolean("logInvalidCerts", true); - enableSignatureBadge = eaglercraftOpts.optBoolean("enableSignatureBadge", true); + enableSignatureBadge = eaglercraftOpts.optBoolean("enableSignatureBadge", false); allowVoiceClient = eaglercraftOpts.optBoolean("allowVoiceClient", true); allowFNAWSkins = eaglercraftOpts.optBoolean("allowFNAWSkins", true); localStorageNamespace = eaglercraftOpts.optString("localStorageNamespace", EaglercraftVersion.localStorageNamespace); @@ -361,6 +364,11 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenu return relays; } + @Override + public boolean isCheckGLErrors() { + return checkGLErrors; + } + @Override public boolean isCheckShaderGLErrors() { return checkShaderGLErrors; @@ -553,6 +561,7 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter, IBootMenu jsonObject.put("joinServer", serverToJoin); jsonObject.put("worldsDB", worldsDB); jsonObject.put("resourcePacksDB", resourcePacksDB); + jsonObject.put("checkGLErrors", checkGLErrors); jsonObject.put("checkShaderGLErrors", checkShaderGLErrors); jsonObject.put("demoMode", demoMode); jsonObject.put("allowUpdateSvc", isAllowUpdateSvc); diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java index 772eb070..909f7816 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java @@ -139,7 +139,7 @@ public class TeaVMUpdateThread implements Runnable { if(b == null) { updateProg.progressBar = 1.0f; updateProg.statusString3 = "FAILED!"; - EagUtils.sleep(300l); + EagUtils.sleep(300); updateProg.progressBar = -1.0f; updateProg.statusString3 = null; continue; @@ -155,7 +155,7 @@ public class TeaVMUpdateThread implements Runnable { } updateProg.statusString2 = "Signature Invalid!"; logger.error("File signature is invalid: {}", url); - EagUtils.sleep(1000l); + EagUtils.sleep(1000); } updateProg.progressBar = -1.0f; diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java index 0de2245a..34fb054d 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMWebSocketClient.java @@ -1,10 +1,8 @@ package net.lax1dude.eaglercraft.v1_8.internal.teavm; -import org.teavm.jso.JSBody; import org.teavm.jso.dom.events.Event; import org.teavm.jso.dom.events.EventListener; import org.teavm.jso.dom.events.MessageEvent; -import org.teavm.jso.typedarrays.ArrayBuffer; import org.teavm.jso.websocket.WebSocket; import net.lax1dude.eaglercraft.v1_8.EagUtils; @@ -73,7 +71,7 @@ public class TeaVMWebSocketClient extends AbstractWebSocketClient { public boolean connectBlocking(int timeoutMS) { long startTime = PlatformRuntime.steadyTimeMillis(); while(!sockIsConnected && !sockIsFailed) { - EagUtils.sleep(50l); + EagUtils.sleep(50); if(PlatformRuntime.steadyTimeMillis() - startTime > timeoutMS * 1000) { break; } @@ -112,13 +110,10 @@ public class TeaVMWebSocketClient extends AbstractWebSocketClient { } } - @JSBody(params = { "sock", "buffer" }, script = "sock.send(buffer);") - protected static native void nativeBinarySend(WebSocket sock, ArrayBuffer buffer); - @Override public void send(byte[] bytes) { if(sockIsConnected) { - nativeBinarySend(sock, TeaVMUtils.unwrapArrayBuffer(bytes)); + sock.send(TeaVMUtils.unwrapArrayBuffer(bytes)); } } diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java index badc5242..500a4f80 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java @@ -54,6 +54,9 @@ public abstract class JSEaglercraftXOptsRoot implements JSObject { @JSBody(script = "return (typeof this.relays === \"object\") ? this.relays : null;") public native JSArrayReader getRelays(); + @JSBody(params = { "def" }, script = "return (typeof this.checkGLErrors === \"boolean\") ? this.checkGLErrors : def;") + public native boolean getCheckGLErrors(boolean defaultValue); + @JSBody(params = { "def" }, script = "return (typeof this.checkShaderGLErrors === \"boolean\") ? this.checkShaderGLErrors : def;") public native boolean getCheckShaderGLErrors(boolean defaultValue); diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java index a9bef778..df865ff9 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java @@ -216,7 +216,7 @@ public class ServerPlatformSingleplayer { logger.error("Fast immediate continue will be disabled for server context due to actually continuing immediately"); return; } - EagUtils.sleep(10l); + EagUtils.sleep(10); currentContinueHack = null; if(!checkMe[0]) { if(immediateContinueChannel != null) { @@ -255,7 +255,7 @@ public class ServerPlatformSingleplayer { if(immediateContinueSupport) { immediateContinueTeaVM(); }else { - EagUtils.sleep(0l); + EagUtils.sleep(0); } } }