From f24350173b4ebd416741cba045dc33712f5ff6ae Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sat, 1 Aug 2020 16:50:02 -0400
Subject: [PATCH] Update Yarn

---
 build.gradle                                             | 2 +-
 gradle.properties                                        | 4 ++--
 .../energonrelics/block/portal/EnergyPortalBlock.java    | 2 +-
 .../block/structure/StructureGeneratorBlock.java         | 4 ++--
 .../energonrelics/mixin/MixinDefaultBiomeFeatures.java   | 9 ++++-----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8940dd8..84a5c4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.4-SNAPSHOT'
+    id 'fabric-loom' version '0.5-SNAPSHOT'
 }
 
 compileJava {
diff --git a/gradle.properties b/gradle.properties
index ea3f81e..12eac77 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx1G
 # Fabric Properties
     # check these on https://fabricmc.net/use
     minecraft_version = 1.16.2-pre1
-    yarn_build = 1
+    yarn_build = 9
     fabric_loader_version = 0.9.0+build.204
 
 # Mod Properties
@@ -13,7 +13,7 @@ org.gradle.jvmargs = -Xmx1G
 
 # Dependencies
     # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-    fabric_api_version = 0.16.2+build.389-1.16
+    fabric_api_version = 0.16.3+build.390-1.16
     modmenu_version = 1.14.5+build.30
     cloth_config_version = 4.7.0-unstable
     autoconfig_version = 3.2.0-unstable
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java
index 8eac2cb..68e3472 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/portal/EnergyPortalBlock.java
@@ -137,7 +137,7 @@ public class EnergyPortalBlock extends SimpleBlock {
     public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
         super.onEntityCollision(state, world, pos, entity);
 
-        if (!world.isClient() && entity.canUsePortals() && ((PortalCooldownEntity) entity).isEnergyPortalCooldown()) {
+        if (!world.isClient() && !entity.hasVehicle() && entity.canUsePortals() && ((PortalCooldownEntity) entity).isEnergyPortalCooldown()) {
             // Teleport
             ((PortalCooldownEntity) entity).resetEnergyPortalCooldown();
         }
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java
index b96b5f4..5b9d98b 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java
@@ -120,9 +120,9 @@ public class StructureGeneratorBlock extends SimpleBlockWithEntity {
         }
     }
 
-    public static void addToBiome(GenerationSettings.class_5495 arg) {
+    public static void addToBiome(GenerationSettings.Builder builder) {
         for (Map.Entry<String, StructureGeneratorBlock> entry : blocks.entrySet()) {
-            arg.method_30995(entry.getValue().feature.configure(DefaultFeatureConfig.INSTANCE));
+            builder.structureFeature(entry.getValue().feature.configure(DefaultFeatureConfig.INSTANCE));
         }
     }
 
diff --git a/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java b/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java
index fd267c6..df2eec7 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java
@@ -2,7 +2,6 @@ package com.thebrokenrail.energonrelics.mixin;
 
 import com.thebrokenrail.energonrelics.EnergonRelics;
 import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock;
-import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.GenerationSettings;
 import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
@@ -14,12 +13,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(DefaultBiomeFeatures.class)
 public class MixinDefaultBiomeFeatures {
     @Inject(at = @At("RETURN"), method = "addDefaultOres")
-    private static void addDefaultOres(GenerationSettings.class_5495 arg, CallbackInfo info) {
-        arg.method_30992(GenerationStep.Feature.UNDERGROUND_ORES, EnergonRelics.VERIDIUM_ORE_FEATURE);
+    private static void addDefaultOres(GenerationSettings.Builder builder, CallbackInfo info) {
+        builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, EnergonRelics.VERIDIUM_ORE_FEATURE);
     }
 
     @Inject(at = @At("RETURN"), method = "addDefaultUndergroundStructures")
-    private static void addDefaultUndergroundStructures(GenerationSettings.class_5495 arg, CallbackInfo info) {
-        StructureGeneratorBlock.addToBiome(arg);
+    private static void addDefaultUndergroundStructures(GenerationSettings.Builder builder, CallbackInfo info) {
+        StructureGeneratorBlock.addToBiome(builder);
     }
 }