Skip to content

Commit d40defd

Browse files
committed
Update deps and bump min Neo version to 21.0.58-beta
1 parent 9b3961d commit d40defd

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
id('eclipse')
2121
id('idea')
2222
id('maven-publish')
23-
id('net.neoforged.gradle.userdev') version('7.0.152')//https://projects.neoforged.net/neoforged/neogradle
23+
id('net.neoforged.gradle.userdev') version('7.0.153')//https://projects.neoforged.net/neoforged/neogradle
2424
}
2525

2626
tasks.named('wrapper', Wrapper).configure {

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ minecraft_version=1.21
99
previous_minecraft_version=1.20.4
1010
previous_minor_minecraft_version=1.20.6
1111
loader_version_range=[4,)
12-
forge_version=21.0.47-beta
12+
forge_version=21.0.58-beta
1313
mod_version=10.6.4
1414
#This determines the minimum version of forge required to use Mekanism
1515
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
16-
forge_version_range=[21.0.46-beta,)
16+
forge_version_range=[21.0.58-beta,)
1717
minecraft_version_range=[1.21]
1818
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1919
# options are: alpha, beta, release
@@ -40,11 +40,11 @@ cc_tweaked_version=1.111.0
4040
crafttweaker_version=20.0.15
4141
ctm_version=1.2.0+1
4242
curios_version=9.0.4+1.21
43-
emi_version=1.1.8
43+
emi_version=1.1.10
4444
grand_power_version=3.0.0
4545
jade_api_id=5427895
4646
jade_id=5493270
47-
jei_version=19.0.0.14
47+
jei_version=19.1.1.19
4848
json_things_version=0.12.0
4949
top_version=1.21_neo-12.0.0-1
5050
wthit_version=12.2.2

src/main/java/mekanism/common/CommonPlayerTickHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ public void checkEntityInvulnerability(EntityInvulnerabilityCheckEvent event) {
159159
}
160160

161161
@SubscribeEvent
162-
@SuppressWarnings("UnstableApiUsage")//Note: DamageContainer isn't actually unstable, they just forgot to unmark it before finalizing the PR
163162
public void onEntityAttacked(LivingIncomingDamageEvent event) {
164163
LivingEntity entity = event.getEntity();
165164
DamageContainer damageContainer = event.getContainer();

src/main/java/mekanism/common/entity/EntityRobit.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ public void readAdditionalSaveData(@NotNull CompoundTag nbtTags) {
525525
}
526526

527527
@Override
528-
@SuppressWarnings("UnstableApiUsage")//Note: DamageContainer isn't actually unstable, they just forgot to unmark it before finalizing the PR
529528
public void onDamageTaken(@NotNull DamageContainer damageContainer) {
530529
energyContainer.extract(FloatingLong.create(1_000 * damageContainer.getNewDamage()), Action.EXECUTE, AutomationType.INTERNAL);
531530
//Don't actually allow taking damage to reduce the robit's health

src/main/java/mekanism/common/tile/laser/TileEntityBasicLaser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ private void withFakePlayer(ServerLevel level, double x, double y, double z, Blo
332332
*
333333
* @return The amount of damage that was blocked
334334
*/
335-
@SuppressWarnings("UnstableApiUsage")//Note: DamageContainer isn't actually unstable, they just forgot to unmark it before finalizing the PR
336335
private float damageShield(Level level, LivingEntity livingEntity, Pos3D from, float damage) {
337336
DamageSource source = MekanismDamageTypes.LASER.source(level, from);
338337
//Absorb part of the damage based on the given absorption ratio

0 commit comments

Comments
 (0)