-
Notifications
You must be signed in to change notification settings - Fork 110
Working 1.21 port (for the most part) #985
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SuperKnux
wants to merge
40
commits into
FallingColors:devel/port-1.21
Choose a base branch
from
SuperKnux:indev/1.21.1
base: devel/port-1.21
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+38,508
−22,803
Open
Changes from all commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
6bcb401
Merge branch 'main' into devel/port-1.21
slava110 2774bbb
Fixed Gradle problems and turned off Fabric temporarily. Will come ba…
slava110 e3391a8
Ported to 1.21 NeoForge, some Neo-specific stuff is on common package…
slava110 c9274b9
Fixing errors made during port
slava110 9f1e2f0
Bumped Java version on workflow from 17 to 21
slava110 87e9ab1
Fix resources
slava110 fb7544e
Fix inline displaying for entity iotas
slava110 1098f8a
Fix creative tab item ordering
slava110 09495cb
* Mostly complete Implementation of Item Components
SuperKnux c4ed240
* More attempts to fix networking
SuperKnux b07e5b7
* More various fixes like...
SuperKnux b3a63f5
Merge remote-tracking branch 'refs/remotes/slava/devel/port-1.21' int…
SuperKnux 8ade16d
Biiiiiig fixes :3
SuperKnux 93a695a
that's. that's not how remapping works
penguinencounter 254917c
* Mod finally builds, but fails to launch client
SuperKnux caea11d
* Replaced serialization-hooks with Fabric API's CustomIngredient system
SuperKnux 63ef2cd
* Forgot to remove traces of serialization-hooks
SuperKnux facfe82
* New FabricRegister for Registries
SuperKnux 96fe119
* Attempted fix for Fabric Packet handling
SuperKnux f60841f
* Updated loom and fixed Fabric building.
SuperKnux 60bafd6
* Changed some files and mixins :help:
SuperKnux d550985
* Some datagen
SuperKnux b0debec
* Finally finished datagen!
SuperKnux cf1a3aa
Fixed crash with impeti breaking (also, fixed failure of item stacks …
SuperKnux 9a8fad3
* Added handlers to S2C Payloads
SuperKnux b64763f
Duplicates strategy stuff
SuperKnux b58bec6
* Adjusted FabricRegister to work correctly, fixes attribute errors o…
SuperKnux 96e569e
* Turned MobEffects into Holder<MobEffect>s. Might have to do this fo…
SuperKnux 7987ab5
* Fixed Impeti not spraying particles or making noise when activated …
SuperKnux 871d6ff
* Fixed slate rendering, scroll rendering, inline pattern rendering (…
SuperKnux 47d68cc
* Added a workaround for https://github.com/SamsTheNerd/inline/issues/34
SuperKnux 9a9e54a
* i guess non-flat inline patterns will be fullbright for now :N_Disb…
SuperKnux 057042c
Update artifact preparation to include Neoforge
SuperKnux b9beb48
* Fixed particle texture bleeding on Neo
SuperKnux 5735591
Merge remote-tracking branch 'origin/indev/1.21.1' into indev/1.21.1
SuperKnux 6f8d182
* Removed the hex_unbreakable.jsons in generated data
SuperKnux 8c860c5
* oops
SuperKnux a9b83be
* Merge updated 1.21 from upstream to indev/1.21.1
SuperKnux eda63f6
Updated generated resources, added synthetic EMI IDs to Fabric brains…
SuperKnux 6de5e26
IDEA failed to be useful; readded generated resources as they should'…
SuperKnux File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,18 @@ architectury { | |
| common(["fabric", "neoforge"]) | ||
| } | ||
|
|
||
| loom { | ||
| accessWidenerPath = file("src/main/resources/hexplat.accesswidener") | ||
| } | ||
|
|
||
| pkSubproj { | ||
| platform = "common" | ||
| pkPublish = false | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| mavenLocal() | ||
|
|
||
| maven { url 'https://maven.blamejared.com' } | ||
|
|
||
|
|
@@ -25,17 +35,25 @@ repositories { | |
| maven { url = "https://maven.terraformersmc.com/releases/" } | ||
| } | ||
|
|
||
| loom { | ||
| accessWidenerPath = file("src/main/resources/hexplat.accesswidener") | ||
| } | ||
|
Comment on lines
+38
to
+40
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a duplicate. |
||
|
|
||
| dependencies { | ||
| // === MANDATORY DEPS === | ||
| compileOnly "at.petra-k:paucal:$paucalVersion+$minecraftVersion-common" | ||
| // We depend on Fabric Loader here to use the Fabric @Environment annotations, | ||
| // which get remapped to the correct annotations on each platform. | ||
| // Do NOT use other classes from Fabric Loader. | ||
| modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" | ||
|
|
||
| modCompileOnly "at.petra-k:paucal:$paucalVersion+$minecraftVersion-common" | ||
| // i do not know why the xplat and mod jars are in different coordinates | ||
| compileOnly "vazkii.patchouli:Patchouli-xplat:1.21-$patchouliVersion-SNAPSHOT" | ||
| // inline isn't out for 1.21 yet shaking my sm my shaking smh head | ||
| // compileOnly "com.samsthenerd.inline:inline-forge:$minecraftVersion-$inlineVersion" | ||
| modCompileOnly "vazkii.patchouli:Patchouli-xplat:1.21-$patchouliVersion-SNAPSHOT" | ||
| modCompileOnly "com.samsthenerd.inline:inline-common:1.21.1-1.2.2-74" | ||
|
|
||
| // === OPTIONAL DEPS === | ||
| modCompileOnly "dev.emi:emi-xplat-intermediary:${emiVersion}:api" | ||
| compileOnly "io.wispforest:accessories-common:$accessoriesVersion" | ||
| modCompileOnly "io.wispforest:accessories-common:$accessoriesVersion" | ||
|
|
||
| // === OTHER STUFF === | ||
| compileOnly "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" | ||
|
|
@@ -60,4 +78,4 @@ processResources { | |
| } | ||
|
|
||
| // it wants a task by this name to exist for some reason | ||
| task("prepareWorkspace") {} | ||
| tasks.register('prepareWorkspace') {} | ||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is unnecessary. We configure
platformin the basebuild.gradle, andpkPublishdefaults tofalsealready.