mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-13 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Forge

Browse Source 
- Bump minimum required Forge version to 36.2.0
- Re-add chorus teleport event compatibility
- Update Flywheel, JEI, and Shade plugin
This commit is contained in:
PepperBell 2021-07-22 14:16:00 -07:00
parent 89c34262d0
commit 37261ee8e6
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -6,18 +6,18 @@ org.gradle.daemon = false
# mod version info # mod version info
mod_version = 0.3.2c mod_version = 0.3.2c
minecraft_version = 1.16.5 minecraft_version = 1.16.5
forge_version = 36.1.32 forge_version = 36.2.0
# build dependency versions # build dependency versions
forgegradle_version = 4.1.+ forgegradle_version = 4.1.+
mixingradle_version = 0.7-SNAPSHOT mixingradle_version = 0.7-SNAPSHOT
shadow_version = 5.2.0 shadow_version = 6.1.0
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
# dependency versions # dependency versions
registrate_version = 1.0.4 registrate_version = 1.0.4
flywheel_version = 1.16-0.1.1.24 flywheel_version = 1.16-0.1.1.26
jei_version = 7.7.0.106 jei_version = 7.7.1.110
# curseforge information # curseforge information
projectId = 328085 projectId = 328085

14
src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java
View File

@ -46,6 +46,8 @@ import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.event.entity.living.EntityTeleportEvent;
import net.minecraftforge.registries.IRegistryDelegate; import net.minecraftforge.registries.IRegistryDelegate;
public class PotatoCannonProjectileTypes { public class PotatoCannonProjectileTypes {
@ -447,14 +449,10 @@ public class PotatoCannonProjectileTypes {
double teleportY = MathHelper.clamp(entityY + (livingEntity.getRandom().nextInt((int) teleportDiameter) - (int) (teleportDiameter / 2)), 0.0D, world.getHeight() - 1); double teleportY = MathHelper.clamp(entityY + (livingEntity.getRandom().nextInt((int) teleportDiameter) - (int) (teleportDiameter / 2)), 0.0D, world.getHeight() - 1);
double teleportZ = entityZ + (livingEntity.getRandom().nextDouble() - 0.5D) * teleportDiameter; double teleportZ = entityZ + (livingEntity.getRandom().nextDouble() - 0.5D) * teleportDiameter;
/* Usable as soon as lowest supported forge > 36.1.3 */ EntityTeleportEvent.ChorusFruit event = ForgeEventFactory.onChorusFruitTeleport(livingEntity, teleportX, teleportY, teleportZ);
if (event.isCanceled())
// EntityTeleportEvent.ChorusFruit event = ForgeEventFactory.onChorusFruitTeleport(livingEntity, teleportX, teleportY, teleportZ); return false;
// if (event.isCanceled()) if (livingEntity.randomTeleport(event.getTargetX(), event.getTargetY(), event.getTargetZ(), true)) {
// return;
// if (livingEntity.attemptTeleport(event.getTargetX(), event.getTargetY(), event.getTargetZ(), true)) {
if (livingEntity.randomTeleport(teleportX, teleportY, teleportZ, true)) {
if (livingEntity.isPassenger()) if (livingEntity.isPassenger())
livingEntity.stopRiding(); livingEntity.stopRiding();

2
src/main/resources/META-INF/mods.toml
View File

@ -18,7 +18,7 @@ Technology that empowers the player.'''
[[dependencies.create]] [[dependencies.create]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[36.1.0,)" versionRange="[36.2.0,)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"