Skip to content

Commit

Permalink
First official release! Made GER obtainable in Survival mode.
Browse files Browse the repository at this point in the history
  • Loading branch information
Novarch129 committed Oct 12, 2020
1 parent 4c441e8 commit f810a4c
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/main/java/io/github/novarch129/jojomod/util/Util.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.github.novarch129.jojomod.util;

import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.matrix.MatrixStack;
import io.github.novarch129.jojomod.JojoBizarreSurvival;
import io.github.novarch129.jojomod.capability.Stand;
Expand Down Expand Up @@ -29,7 +28,10 @@
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.*;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EntityPredicates;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
Expand Down Expand Up @@ -137,10 +139,6 @@ public static void setupActSwitch(ServerPlayerEntity standMaster, int standID, i
}
}

public static List<NonNullList<ItemStack>> getEntirePlayerInventory(PlayerEntity player) {
return ImmutableList.of(player.inventory.mainInventory, player.inventory.armorInventory, player.inventory.offHandInventory);
}

public static boolean isClientHoldingShift() {
return InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), GLFW.GLFW_KEY_LEFT_SHIFT) || InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), GLFW.GLFW_KEY_RIGHT_SHIFT);
}
Expand Down

0 comments on commit f810a4c

Please sign in to comment.