Skip to content

Commit

Permalink
Development
Browse files Browse the repository at this point in the history
  • Loading branch information
M-W-K committed Apr 30, 2024
1 parent 3aeed52 commit 308372f
Show file tree
Hide file tree
Showing 67 changed files with 19,445 additions and 162 deletions.
Binary file modified .gradle/8.1.1/checksums/checksums.lock
Binary file not shown.
Binary file modified .gradle/8.1.1/checksums/md5-checksums.bin
Binary file not shown.
Binary file modified .gradle/8.1.1/checksums/sha1-checksums.bin
Binary file not shown.
Binary file modified .gradle/8.1.1/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified .gradle/8.1.1/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/discord.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id 'idea'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
id 'org.spongepowered.mixin' version '0.7.+'
}

version = mod_version
Expand Down Expand Up @@ -130,6 +131,9 @@ dependencies {
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

// Apply Mixin AP
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'

// Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
Expand All @@ -146,6 +150,13 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/dependency_management.html
}

mixin {
config 'amethystwings.mixins.json'

debug.verbose = true
debug.export = true
}

// This block of code expands all declared replace properties in the specified resource targets.
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
Expand Down
6 changes: 3 additions & 3 deletions build/_applyBinpatches_2/log.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Java Launcher: /Users/michael/Library/Java/JavaVirtualMachines/jbrsdk-17.0.9-x86/Contents/Home/bin/java
Arguments: '--clean, /Users/michael/.gradle/caches/forge_gradle/mcp_repo/net/minecraft/joined/1.20.1-20230612.114412/joined-1.20.1-20230612.114412-srg.jar, --output, /Users/michael/.gradle/caches/forge_gradle/minecraft_user_repo/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatched.jar, --apply, /Users/michael/.gradle/caches/forge_gradle/minecraft_user_repo/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatches.lzma'
Arguments: '--clean, /Users/michael/.gradle/caches/forge_gradle/mcp_repo/net/minecraft/joined/1.20.1-20230612.114412/joined-1.20.1-20230612.114412-srg.jar, --output, /Users/michael/Documents/dev/AmethystWings/build/fg_cache/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatched.jar, --apply, /Users/michael/Documents/dev/AmethystWings/build/fg_cache/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatches.lzma'
Classpath:
- /Users/michael/.gradle/caches/forge_gradle/maven_downloader/net/minecraftforge/binarypatcher/1.1.1/binarypatcher-1.1.1-fatjar.jar
Working directory: /Users/michael/Documents/dev/AmethystWings/build/_applyBinpatches_2
Main class: net.minecraftforge.binarypatcher.ConsoleTool
====================================
Applying:
Clean: /Users/michael/.gradle/caches/forge_gradle/mcp_repo/net/minecraft/joined/1.20.1-20230612.114412/joined-1.20.1-20230612.114412-srg.jar
Output: /Users/michael/.gradle/caches/forge_gradle/minecraft_user_repo/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatched.jar
Output: /Users/michael/Documents/dev/AmethystWings/build/fg_cache/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatched.jar
KeepData: false
Unpatched: false
Pack200: false
Legacy: false
Loading patches file: /Users/michael/.gradle/caches/forge_gradle/minecraft_user_repo/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatches.lzma
Loading patches file: /Users/michael/Documents/dev/AmethystWings/build/fg_cache/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-binpatches.lzma
Reading patch com.mojang.blaze3d.pipeline.RenderTarget.binpatch
Checksum: 151eb55a Exists: true
Reading patch com.mojang.blaze3d.platform.GlStateManager$BlendState.binpatch
Expand Down
18,254 changes: 18,254 additions & 0 deletions build/_atJar_4/accesstransform.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/_atJar_4/log.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Java Launcher: /Users/michael/Library/Java/JavaVirtualMachines/jbrsdk-17.0.9-x86/Contents/Home/bin/java
Arguments: '--inJar, /Users/michael/.gradle/caches/forge_gradle/minecraft_user_repo/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-injected.jar, --outJar, /Users/michael/.gradle/caches/forge_gradle/minecraft_user_repo/net/minecraftforge/forge/1.20.1-47.2.30_mapped_official_1.20.1/forge-1.20.1-47.2.30_mapped_official_1.20.1.jar, --logFile, accesstransform.log, --atFile, /Users/michael/Documents/dev/AmethystWings/build/_atJar_4/parent_at.cfg'
Arguments: '--inJar, /Users/michael/Documents/dev/AmethystWings/build/fg_cache/net/minecraftforge/forge/1.20.1-47.2.30/forge-1.20.1-47.2.30-injected.jar, --outJar, /Users/michael/Documents/dev/AmethystWings/build/fg_cache/net/minecraftforge/forge/1.20.1-47.2.30_mapped_official_1.20.1/forge-1.20.1-47.2.30_mapped_official_1.20.1.jar, --logFile, accesstransform.log, --atFile, /Users/michael/Documents/dev/AmethystWings/src/main/resources/META-INF/accesstransformer.cfg, --atFile, /Users/michael/Documents/dev/AmethystWings/build/_atJar_4/parent_at.cfg'
Classpath:
- /Users/michael/.gradle/caches/forge_gradle/maven_downloader/net/minecraftforge/accesstransformers/8.2.0/accesstransformers-8.2.0-fatjar.jar
Working directory: /Users/michael/Documents/dev/AmethystWings/build/_atJar_4
Expand Down
2 changes: 1 addition & 1 deletion build/downloadMCMeta/version.json

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions run-data/config/fml.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#Early window height
earlyWindowHeight = 480
#Enable forge global version checking
versionCheck = true
#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
earlyWindowControl = true
#Early window framebuffer scale
earlyWindowFBScale = 1
#Early window provider
earlyWindowProvider = "fmlearlywindow"
#Early window width
earlyWindowWidth = 854
#Early window starts maximized
earlyWindowMaximized = false
#Default config path for servers
defaultConfigPath = "defaultconfigs"
#Disables Optimized DFU client-side - already disabled on servers
disableOptimizedDFU = true
#Skip specific GL versions, may help with buggy graphics card drivers
earlyWindowSkipGLVersions = []
#Max threads for early initialization parallelism, -1 is based on processor count
maxThreads = -1
#Squir?
earlyWindowSquir = false
#Whether to show CPU usage stats in early window
earlyWindowShowCPU = false

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// 1.20.1 2024-04-29T16:55:47.888275 Recipes
a6e850a4a233da4b788a29311a861d7b6cf31aa1 data/amethystwings/advancements/recipes/misc/auric_amethyst.json
91ebf5befe619dc3583c60cd3b7758ad6af0d57f data/amethystwings/advancements/recipes/misc/energetic_amethyst.json
404d8ec5375894d638aceff7340a9713a571361e data/amethystwings/advancements/recipes/misc/hardened_amethyst.json
deca3f74865e9a9c638abbf53a85d1710dfeb4ad data/amethystwings/advancements/recipes/misc/resonant_amethyst.json
e95b211b885d807630cb3e200b88d9478a8047d3 data/amethystwings/advancements/recipes/misc/shaped_amethyst.json
c42951a31ce1d8a835f48fefe1d4852c740f76ef data/amethystwings/advancements/recipes/misc/treated_amethyst.json
645fe9d8841984d693fd8e22e2b390414e828c5f data/amethystwings/advancements/recipes/misc/wings_controller.json
ffd8a9c273dcc5f0837ec3dae1bd2e3bb1d1eab1 data/amethystwings/recipes/auric_amethyst.json
590b23e23e86ccfdf22e063038fa48fc2a13f31a data/amethystwings/recipes/energetic_amethyst.json
ddb4009e0553ca8f5639004b5643ef316002955c data/amethystwings/recipes/hardened_amethyst.json
e3e9b2d61994357aefab6ec77cd228de8f8db289 data/amethystwings/recipes/resonant_amethyst.json
823e1e90b6acceb58650153b3ce18197dabe9444 data/amethystwings/recipes/shaped_amethyst.json
133ce4ae964f9312f4886474d16f8067b5632212 data/amethystwings/recipes/treated_amethyst.json
7e48c316e05fd6bca734e0e56e41f2e67ee39b7d data/amethystwings/recipes/wings_controller.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"amethystwings:treated_amethyst"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:auric_amethyst"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:auric_amethyst"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"amethystwings:treated_amethyst"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:energetic_amethyst"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:energetic_amethyst"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"amethystwings:treated_amethyst"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:hardened_amethyst"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:hardened_amethyst"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"amethystwings:treated_amethyst"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:resonant_amethyst"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:resonant_amethyst"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"amethystwings:treated_amethyst"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:shaped_amethyst"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:shaped_amethyst"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"minecraft:amethyst_shard"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:treated_amethyst"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:treated_amethyst"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"criteria": {
"conditions": {
"items": [
{
"items": [
"minecraft:amethyst_shard"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "amethystwings:wings_controller"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"criteria",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"amethystwings:wings_controller"
]
},
"sends_telemetry_event": false
}
Loading

0 comments on commit 308372f

Please sign in to comment.