Skip to content

Commit 0182e21

Browse files
TUsamaTUsama
authored
Merge branch '1.20-Forge' into curios
2 parents c2d72ba + 129b267 commit 0182e21

File tree

162 files changed

+2246
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+2246
-627
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "Library-of-Exile-Rework"]
22
path = Library-of-Exile-Rework
33
url = https://github.com/mahjerion/Library-of-Exile-Rework.git
4+
[submodule "the_harvest"]
5+
path = the_harvest
6+
url = https://github.com/mahjerion/the_harvest.git
7+
[submodule "ancient_obelisks"]
8+
path = ancient_obelisks
9+
url = https://github.com/mahjerion/ancient_obelisks.git

‎Library-of-Exile-Rework‎

‎ancient_obelisks‎

Submodule ancient_obelisks added at 286dbfc

‎build.gradle‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ mixin {
1717
}
1818

1919
base {
20-
archivesName = "${mod_display_name}-${minecraft_version}"
20+
archivesName = "${mod_archive_name}-${minecraft_version}"
21+
}
22+
23+
sourceSets.main.resources{
24+
srcDir 'src/generated/resources'
25+
exclude '.cache/**'
2126
}
2227

2328
legacyForge {
@@ -68,6 +73,7 @@ legacyForge {
6873
)
6974
}
7075

76+
// Enable Enhanced Class Redefinition (JBR)
7177
jvmArguments.add("-XX:+AllowEnhancedClassRedefinition")
7278
}
7379

@@ -142,9 +148,8 @@ dependencies {
142148

143149
modImplementation("dev.kosmx.player-anim:player-animation-lib-forge:${player_animator_version}")
144150

145-
modImplementation("maven.modrinth:the-harvest:${project.the_harvest_version}")
146151
//idk why the 1.1.3 version on modrinth is broken, it spend me like a whole afternoon to figure it out
147-
modImplementation("curse.maven:dungeon-realm-1200770:6814707")
152+
modImplementation("curse.maven:dungeon-realm-${project.dungeon_realm_project}:${project.dungeon_realm_file}")
148153
//modImplementation("maven.modrinth:dungeon-realm:${project.dungeon_realm_version}")
149154

150155
//this is directly from the include build!
@@ -154,11 +159,12 @@ dependencies {
154159
//you need to push to your fork first, and then open a PR!
155160
//everytime you change the version of lib, you need to change the version of this too!
156161
modImplementation("com.robertx22:Library-of-Exile-Rework:${project.exile_library_version}")
162+
modImplementation("com.robertx22:ancient-obelisks:${project.ancient_obelisks_version}")
163+
modImplementation("com.robertx22:the_harvest:${project.the_harvest_version}")
157164
//modImplementation("maven.modrinth:library-of-exile:${project.exile_library_version}")
158165
}
159166

160167

161-
162168
jar {
163169

164170
finalizedBy('reobfJar')
@@ -187,21 +193,22 @@ tasks.withType(JavaCompile).configureEach {
187193
processResources {
188194
int pack_format = getPackFormat()
189195
var expandProps = [
190-
"mod_version" : mod_version,
191-
"mod_id" : mod_id,
192-
"mod_issues_link" : mod_issues_link,
193-
"mod_website_link": mod_website_link,
194-
"mod_display_name": mod_display_name,
195-
"mod_author": mod_author,
196-
"forge_version":forge_version,
197-
"exile_library_version":exile_library_version,
198-
"dungeon_realm_version":dungeon_realm_version,
199-
"the_harvest_version":the_harvest_version,
200-
'group' : project.group, //Else we target the task's group.
201-
'minecraft_version' : minecraft_version,
202-
'mod_name' : mod_archive_name,
203-
'description' : project.description,
204-
"pack_format" : pack_format
196+
"mod_version" : mod_version,
197+
"mod_id" : mod_id,
198+
"mod_issues_link" : mod_issues_link,
199+
"mod_website_link" : mod_website_link,
200+
"mod_display_name" : mod_display_name,
201+
"mod_author" : mod_author,
202+
"forge_version" : forge_version,
203+
"exile_library_version" : exile_library_version,
204+
"dungeon_realm_version" : dungeon_realm_version,
205+
"ancient_obelisks_version": ancient_obelisks_version,
206+
"the_harvest_version" : the_harvest_version,
207+
'group' : project.group, //Else we target the task's group.
208+
'minecraft_version' : minecraft_version,
209+
'mod_name' : mod_archive_name,
210+
'description' : project.description,
211+
"pack_format" : pack_format
205212
]
206213

207214
var jsonExpandProps = expandProps.collectEntries {
@@ -263,13 +270,15 @@ publishMods {
263270
requires { slug = "playeranimator" }
264271
requires { slug = "dungeon-realm" }
265272
requires { slug = "the-harvest" }
273+
requires { slug = "ancient-obelisks" }
266274
}
267275
modrinth {
268276
requires { slug = "library-of-exile" }
269277
requires { slug = "curios" }
270278
requires { slug = "playeranimator" }
271279
requires { slug = "dungeon-realm" }
272280
requires { slug = "the-harvest" }
281+
requires { slug = "ancient-obelisks" }
273282
}
274283
}
275284
/*

‎gradle.properties‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx2G
33
#allow gradle to cache the build
4-
#org.gradle.caching=true
4+
org.gradle.caching=true
55
# --- COMMON GRADLE START ---
66
# Mod Properties
77
mod_version=6.3.7
@@ -32,11 +32,17 @@ group=com.robertx22
3232
maven_group = com.robertx22
3333

3434
# Dependencies
35-
exile_library_version=2.1.3
35+
36+
exile_library_version=2.1.4
3637
curios_version=5.14.1+1.20.1
3738
jei_version=15.2.0.27
3839
wiki_toolkit_version=0.2.4
3940
publish_plugin_version=0.8.3
4041
player_animator_version=1.0.2-rc1+1.20
41-
dungeon_realm_version=1.1.3
42-
the_harvest_version=1.1.1
42+
dungeon_realm_version=1.1.4
43+
the_harvest_version=1.1.2
44+
ancient_obelisks_version=1.2.2
45+
dungeon_realm_project=1200770
46+
dungeon_realm_file=6814707
47+
ancient_obelisks_project=1186288
48+
ancient_obelisks_file=6814709

‎settings.gradle‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,11 @@ plugins {
4141
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
4242
}
4343

44-
includeBuild "Library-of-Exile-Rework"
44+
includeBuild "Library-of-Exile-Rework"
45+
includeBuild "the_harvest"
46+
includeBuild("ancient_obelisks") {
47+
dependencySubstitution {
48+
// map the hyphenated module to the included build
49+
substitute(module("com.robertx22:ancient-obelisks")).using(project(":"))
50+
}
51+
}

‎src/main/java/com/robertx22/addons/dungeon_realm/DungeonAddonEvents.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.robertx22.mine_and_slash.maps.MapData;
1313
import com.robertx22.mine_and_slash.maps.MapItemData;
1414
import com.robertx22.mine_and_slash.uncommon.ExplainedResultUtil;
15+
import com.robertx22.mine_and_slash.uncommon.UnstuckMobs;
1516
import com.robertx22.mine_and_slash.uncommon.datasaving.Load;
1617
import com.robertx22.mine_and_slash.uncommon.datasaving.StackSaving;
1718
import com.robertx22.mine_and_slash.uncommon.interfaces.data_items.IRarity;
@@ -85,6 +86,7 @@ public void accept(PrepareDungeonMobEditsEvent event) {
8586
}
8687

8788
});
89+
UnstuckMobs.unstuckFromWalls(event.mob);
8890
}
8991
});
9092

‎src/main/java/com/robertx22/addons/orbs_of_crafting/currency/base/CodeCurrency.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static class Weights {
2525
public static int RARE = 250;
2626
public static int UBER = 50;
2727
public static int MEGA_UBER = 10;
28-
28+
public static int MIRROR = 1;
2929
}
3030

3131

‎src/main/java/com/robertx22/addons/orbs_of_crafting/currency/base/GearCurrency.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public ExplainedResult canItemBeModified(LocReqContext context) {
7373
return ExplainedResult.failure(Chats.CORRUPT_CANT_BE_MODIFIED.locName());
7474
}
7575

76+
if (ex.isMirrored() && this.spendsGearPotential()) {
77+
return ExplainedResult.failure(Chats.MIRRORED_CANT_BE_MODIFIED.locName());
78+
}
79+
7680
if (!ex.get(StackKeys.POTENTIAL).has() || ex.get(StackKeys.POTENTIAL).get().potential < 1) {
7781
if (this.spendsGearPotential()) {
7882
return ExplainedResult.failure(Chats.GEAR_NO_POTENTIAL.locName());

‎src/main/java/com/robertx22/addons/orbs_of_crafting/currency/reworked/ExileCurrencies.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
6868
return ExileCurrency.Builder.of(id, info.tier.word + " Sharpening Stone", ItemReqs.INSTANCE.IS_GEAR)
6969
.rarity(info.tier.rar)
7070
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
71+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
7172
.addAlwaysUseModification(ItemMods.INSTANCE.SHARPEN_STONE_QUALITY.get(info))
7273
.edit(MaxUsesKey.ofUses(ItemReqs.Datas.MAX_SHARPENING_STONE_USES.toKey()))
7374
.potentialCost(0)
@@ -78,15 +79,25 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
7879

7980
public ExileKey<ExileCurrency, IdKey> CORRUPT_GEAR = ExileCurrency.Builder.of("chaos_orb", "Orb of Chaos", ItemReqs.INSTANCE.IS_GEAR)
8081
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
82+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
8183
.rarity(IRarity.UNIQUE_ID)
8284
.addModification(ItemMods.INSTANCE.CORRUPT_GEAR, 75)
8385
.addModification(Modifications.INSTANCE.DESTROY_ITEM, 25)
8486
.potentialCost(0)
8587
.weight(1000)
8688
.build(this);
8789

90+
public ExileKey<ExileCurrency, IdKey> MIRROR = ExileCurrency.Builder.of("mirror", "Orb of Reflection", ItemReqs.INSTANCE.IS_GEAR, ItemReqs.INSTANCE.IS_JEWEL)
91+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
92+
.rarity(IRarity.MYTHIC_ID)
93+
.addAlwaysUseModification(ItemMods.INSTANCE.MIRROR)
94+
.potentialCost(0)
95+
.weight(CodeCurrency.Weights.MIRROR)
96+
.build(this);
97+
8898
public ExileKey<ExileCurrency, IdKey> LEVEL_GEAR = ExileCurrency.Builder.of("level_up_orb", "Orb of Infinity", ItemReqs.INSTANCE.IS_GEAR)
8999
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
100+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
90101
.rarity(IRarity.UNCOMMON)
91102
.addRequirement(ItemReqs.INSTANCE.LEVEL_NOT_MAX)
92103
.addModification(ItemMods.INSTANCE.ADD_GEAR_LEVEL, 1)
@@ -97,6 +108,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
97108

98109
public ExileKey<ExileCurrency, IdKey> ADD_SOCKET = ExileCurrency.Builder.of("socket_adder", "Orb of Digging", ItemReqs.INSTANCE.IS_GEAR)
99110
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
111+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
100112
.addRequirement(ItemReqs.INSTANCE.CAN_ADD_SOCKETS)
101113
.rarity(IRarity.RARE_ID)
102114
.addModification(ItemMods.INSTANCE.ADD_SOCKET, 50)
@@ -107,6 +119,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
107119

108120
public ExileKey<ExileCurrency, IdKey> UNIQUE_STAT_REROLL = ExileCurrency.Builder.of("unique_reroll", "Orb of Imperfection", ItemReqs.INSTANCE.IS_GEAR)
109121
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
122+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
110123
.rarity(IRarity.RARE_ID)
111124
.addRequirement(ItemReqs.INSTANCE.IS_RARITY.map.get(new RarityKeyInfo(IRarity.UNIQUE_ID)))
112125
.addModification(ItemMods.INSTANCE.ADD_5_PERCENT_UNIQUE_STATS, 60)
@@ -117,6 +130,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
117130

118131
public ExileKey<ExileCurrency, IdKey> REROLL_RANDOM_AFFIX = ExileCurrency.Builder.of("affix_common_reroll", "Orb of New Beginnings", ItemReqs.INSTANCE.IS_GEAR)
119132
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
133+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
120134
.rarity(IRarity.RARE_ID)
121135
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIXES)
122136
.addAlwaysUseModification(ItemMods.INSTANCE.REROLL_RANDOM_AFFIX)
@@ -127,6 +141,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
127141
public ExileKey<ExileCurrency, IdKey> REROLL_RANDOM_AFFIX_TO_MYTHIC = ExileCurrency.Builder.of("affix_random_mythic_reroll", "Orb of Divine Benevolence", ItemReqs.INSTANCE.IS_GEAR)
128142
.rarity(IRarity.MYTHIC_ID)
129143
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
144+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
130145
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIXES)
131146
.addRequirement(ItemReqs.INSTANCE.NOT_CRAFTED)
132147
.addRequirement(ItemReqs.INSTANCE.IS_RARITY.get(new RarityKeyInfo(IRarity.MYTHIC_ID)))
@@ -138,6 +153,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
138153

139154
public ExileKey<ExileCurrency, IdKey> UPGRADE_OR_DOWNGRADE_RANDOM_AFFIX = ExileCurrency.Builder.of("affix_tier_up_down", "Orb of Imbalance", ItemReqs.INSTANCE.IS_GEAR)
140155
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
156+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
141157
.rarity(IRarity.RARE_ID)
142158
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIXES)
143159
.addModification(ItemMods.INSTANCE.UPGRADE_RANDOM_AFFIX, 60)
@@ -148,6 +164,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
148164

149165
public ExileKey<ExileCurrency, IdKey> UPGRADE_QUALITY = ExileCurrency.Builder.of("orb_of_quality", "Orb of Quality", ItemReqs.INSTANCE.IS_GEAR)
150166
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
167+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
151168
.addRequirement(ItemReqs.INSTANCE.UNDER_20_QUALITY)
152169
.rarity(IRarity.UNCOMMON)
153170
.addAlwaysUseModification(ItemMods.INSTANCE.ADD_GEAR_QUALITY)
@@ -157,6 +174,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
157174

158175
public ExileKey<ExileCurrency, IdKey> REROLL_INFUSION = ExileCurrency.Builder.of("enchant_reroll", "Orb of Second Guessing", ItemReqs.INSTANCE.IS_GEAR)
159176
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
177+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
160178
.addRequirement(ItemReqs.INSTANCE.HAS_INFUSION)
161179
.rarity(IRarity.UNCOMMON)
162180
.addAlwaysUseModification(ItemMods.INSTANCE.REROLL_INFUSION)
@@ -167,6 +185,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
167185
/*
168186
public ExileKey<ExileCurrency, IdKey> MAP_RARITY_UPGRADE = ExileCurrency.Builder.of("map_rarity_upgrade", "Map Rarity Upgrade Orb", WorksOnBlock.ItemType.MAP)
169187
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
188+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
170189
.addRequirement(ItemReqs.INSTANCE.MAP_HAS_HIGHER_RARITY)
171190
.rarity(IRarity.EPIC_ID)
172191
.addAlwaysUseModification(ItemMods.INSTANCE.UPGRADE_MAP_RARITY)
@@ -180,6 +199,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
180199
public ExileKey<ExileCurrency, IdKey> UPGRADE_COMMON_AFFIX = ExileCurrency.Builder.of("upgrade_common_affix", "Orb of Fledgling's Reprieve", ItemReqs.INSTANCE.IS_GEAR)
181200
.rarity(IRarity.RARE_ID)
182201
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
202+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
183203
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIX_OF_RARITY.get(new RarityKeyInfo(IRarity.COMMON_ID)))
184204
.addAlwaysUseModification(ItemMods.INSTANCE.UPGRADE_SPECIFIC_AFFIX_RARITY.get(new RarityKeyInfo(IRarity.COMMON_ID)))
185205
.potentialCost(3)
@@ -189,6 +209,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
189209
public ExileKey<ExileCurrency, IdKey> REROLL_AFFIX_NUMBERS = ExileCurrency.Builder.of("affix_number_reroll", "Orb of Ciphers", ItemReqs.INSTANCE.IS_GEAR)
190210
.rarity(IRarity.RARE_ID)
191211
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
212+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
192213
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIXES)
193214
.addAlwaysUseModification(ItemMods.INSTANCE.REROLL_AFFIX_NUMBERS)
194215
.potentialCost(5)
@@ -198,6 +219,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
198219
public ExileKey<ExileCurrency, IdKey> REROLL_IMPLICIT_NUMBERS = ExileCurrency.Builder.of("implicit_number_reroll", "Orb of Genesis", ItemReqs.INSTANCE.IS_GEAR)
199220
.rarity(IRarity.LEGENDARY_ID)
200221
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
222+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
201223
.addRequirement(ItemReqs.INSTANCE.HAS_IMPLICIT)
202224
.addAlwaysUseModification(ItemMods.INSTANCE.REROLL_IMPLICIT_NUMBERS)
203225
.potentialCost(10)
@@ -207,6 +229,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
207229
public ExileKey<ExileCurrency, IdKey> UPGRADE_CORRUPTION_AFFIX = ExileCurrency.Builder.of("up_corrupt_affix", "Orb of Foolish Risk",
208230
ItemReqs.INSTANCE.IS_GEAR, ItemReqs.INSTANCE.IS_JEWEL)
209231
.rarity(IRarity.EPIC_ID)
232+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
210233
.addRequirement(ItemReqs.INSTANCE.HAS_CORRUPTION_AFFIXES)
211234
.addModification(ItemMods.INSTANCE.UPGRADE_CORRUPTION_AFFIX_RARITY, 90)
212235
.addModification(Modifications.INSTANCE.DESTROY_ITEM, 10)
@@ -235,6 +258,7 @@ public ExileCurrencies(ModRequiredRegisterInfo modRegisterInfo) {
235258

236259
public ExileKey<ExileCurrency, IdKey> EASY_ONE_TIME_UPGRADE = ExileCurrency.Builder.of("orb_of_relief", "Orb of Relief", ItemReqs.INSTANCE.IS_GEAR)
237260
.addRequirement(ItemReqs.INSTANCE.IS_NOT_CORRUPTED)
261+
.addRequirement(ItemReqs.INSTANCE.IS_NOT_MIRRORED)
238262
.rarity(IRarity.EPIC_ID)
239263
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIXES)
240264
.addRequirement(ItemReqs.INSTANCE.HAS_AFFIX_OF_RARITY_OR_LOWER.get(new RarityKeyInfo(IRarity.EPIC_ID)))

0 commit comments

Comments
 (0)