Skip to content

Commit 8d284da

Browse files
committed
Update Neo, and account for breaking changes, and fix copy-paste error of adding the laser amplifier twice to functional blocks, instead of one being the laser tractor beam
1 parent 216cf0d commit 8d284da

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ minecraft_version=1.20.6
88
previous_minecraft_version=1.20.1
99
previous_minor_minecraft_version=1.20.4
1010
loader_version_range=[2,)
11-
forge_version=20.6.42-beta
11+
forge_version=20.6.57-beta
1212
mod_version=10.5.20
1313
#This determines the minimum version of forge required to use Mekanism
1414
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
15-
forge_version_range=[20.6.41-beta,)
15+
forge_version_range=[20.6.50-beta,)
1616
minecraft_version_range=[1.20.6]
1717
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1818
# options are: alpha, beta, release

src/main/java/mekanism/common/registries/MekanismCreativeTabs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private static void addToExistingTabs(BuildCreativeModeTabContentsEvent event) {
9898
}
9999
}
100100
CreativeTabDeferredRegister.addToDisplay(event, MekanismBlocks.SECURITY_DESK, MekanismBlocks.RADIOACTIVE_WASTE_BARREL, MekanismBlocks.PERSONAL_CHEST,
101-
MekanismBlocks.PERSONAL_BARREL, MekanismBlocks.CHARGEPAD, MekanismBlocks.LASER, MekanismBlocks.LASER_AMPLIFIER, MekanismBlocks.LASER_AMPLIFIER,
101+
MekanismBlocks.PERSONAL_BARREL, MekanismBlocks.CHARGEPAD, MekanismBlocks.LASER, MekanismBlocks.LASER_AMPLIFIER, MekanismBlocks.LASER_TRACTOR_BEAM,
102102
MekanismBlocks.QUANTUM_ENTANGLOPORTER, MekanismBlocks.OREDICTIONIFICATOR, MekanismBlocks.FUELWOOD_HEATER, MekanismBlocks.MODIFICATION_STATION,
103103
MekanismBlocks.QIO_DRIVE_ARRAY, MekanismBlocks.QIO_DASHBOARD, MekanismBlocks.QIO_EXPORTER, MekanismBlocks.QIO_IMPORTER, MekanismBlocks.QIO_REDSTONE_ADAPTER);
104104
} else if (tabKey == CreativeModeTabs.REDSTONE_BLOCKS) {

src/tools/java/mekanism/tools/common/MobEquipmentHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.minecraft.world.entity.monster.piglin.Piglin;
1818
import net.minecraft.world.item.ItemStack;
1919
import net.minecraft.world.item.enchantment.EnchantmentHelper;
20-
import net.neoforged.neoforge.event.entity.living.MobSpawnEvent;
20+
import net.neoforged.neoforge.event.entity.living.FinalizeSpawnEvent;
2121

2222
public class MobEquipmentHelper {
2323

@@ -40,7 +40,7 @@ private static boolean isZombie(LivingEntity entity) {
4040
return entity instanceof Zombie && !(entity instanceof Drowned) && !(entity instanceof ZombifiedPiglin);
4141
}
4242

43-
public static void onLivingSpecialSpawn(MobSpawnEvent.FinalizeSpawn event) {
43+
public static void onLivingSpecialSpawn(FinalizeSpawnEvent event) {
4444
LivingEntity entity = event.getEntity();
4545
boolean isZombie = isZombie(entity);
4646
if (isZombie || entity instanceof Skeleton || entity instanceof Stray || entity instanceof Piglin) {

0 commit comments

Comments
 (0)