Bump forge to fix PIE issues. Closes #2091, unofficial repo #472

This commit is contained in:
Vincent Lee committed 2017-05-01 18:34:45 -05:00
1 parent 6a184f085d
commit 04fc77b25f
8 files changed
+73 -42

No files matched your search

@@ -10,6 +10,7 @@
*/
package vazkii.botania.client.core.handler;
import net.minecraft.util.EnumActionResult;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
@@ -95,6 +96,7 @@ public final class MultiblockRenderHandler {
anchor = event.getPos();
angle = event.getEntityPlayer().getHorizontalFacing();
event.setCanceled(true);
event.setCancellationResult(EnumActionResult.SUCCESS);
}
}
@@ -22,9 +22,19 @@ public class GuiFactory implements IModGuiFactory {
@Override
public void initialize(Minecraft minecraftInstance) {}
@Override
public boolean hasConfigGui() {
return true;
}
@Override
public GuiScreen createConfigGui(GuiScreen parentScreen) {
return new GuiBotaniaConfig(parentScreen);
}
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return GuiBotaniaConfig.class;
return null;
}
@Override
@@ -162,8 +162,11 @@ public class BlockAltar extends BlockMod implements ILexiconable {
if(player.isSneaking()) {
InventoryHelper.withdrawFromInventory(tile, player);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile);
} else if(tile.isEmpty() && tile.hasWater && stack.isEmpty())
return true;
} else if(tile.isEmpty() && tile.hasWater && stack.isEmpty()) {
tile.trySetLastRecipe(player);
return true;
}
else {
if(!stack.isEmpty() && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) {
if(!tile.hasWater) {
@@ -76,10 +76,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable
if(altar.manaToGet == 0) {
InventoryHelper.withdrawFromInventory(altar, player);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar);
return true;
}
} else if(altar.isEmpty() && stack.isEmpty()) {
altar.trySetLastRecipe(player);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar);
return true;
} else if(!stack.isEmpty()) {
boolean result = altar.addItem(player, stack, hand);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar);
@@ -76,8 +76,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
stack.shrink(1);
event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F);
event.setCanceled(true);
}
event.setCanceled(true);
event.setCancellationResult(EnumActionResult.SUCCESS);
}
}
@@ -29,6 +29,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
@@ -71,7 +72,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
EntityPlayer player = event.getEntityPlayer();
ItemStack lokiRing = getLokiRing(player);
if(lokiRing.isEmpty() || player.world.isRemote || event.getHand() == EnumHand.OFF_HAND)
if(lokiRing.isEmpty() || !player.isSneaking())
return;
int slot = -1;
@@ -88,49 +89,51 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
BlockPos originCoords = getOriginPos(lokiRing);
RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.world, player, true, 10F);
List<BlockPos> cursors = getCursorList(lokiRing);
int cursorCount = cursors.size();
int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25));
int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25));
if(lookPos == null || lookPos.getBlockPos() == null)
return;
if(heldItemStack.isEmpty() && player.isSneaking()) {
if(originCoords.getY() == -1 && lookPos != null && lookPos.getBlockPos() != null) {
setOriginPos(lokiRing, lookPos.getBlockPos());
setCursorList(lokiRing, null);
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
} else if(lookPos != null && lookPos.getBlockPos() != null) {
if(originCoords.equals(lookPos.getBlockPos())) {
setOriginPos(lokiRing, new BlockPos(0, -1, 0));
if(heldItemStack.isEmpty()) {
if(!event.getWorld().isRemote) {
if(originCoords.getY() == -1) {
setOriginPos(lokiRing, lookPos.getBlockPos());
setCursorList(lokiRing, null);
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
} else {
addCursor : {
BlockPos relPos = lookPos.getBlockPos().add(new BlockPos(-originCoords.getX(), -originCoords.getY(), -originCoords.getZ()));
if(originCoords.equals(lookPos.getBlockPos())) {
setOriginPos(lokiRing, new BlockPos(0, -1, 0));
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
} else {
addCursor : {
BlockPos relPos = lookPos.getBlockPos().add(new BlockPos(-originCoords.getX(), -originCoords.getY(), -originCoords.getZ()));
for(BlockPos cursor : cursors)
if(cursor.equals(relPos)) {
cursors.remove(cursor);
setCursorList(lokiRing, cursors);
for(BlockPos cursor : cursors)
if(cursor.equals(relPos)) {
cursors.remove(cursor);
setCursorList(lokiRing, cursors);
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
break addCursor;
}
addCursor(lokiRing, relPos);
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
break addCursor;
}
addCursor(lokiRing, relPos);
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
}
}
}
}
} else if(!heldItemStack.isEmpty() && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) {
event.setCanceled(true);
event.setCancellationResult(EnumActionResult.SUCCESS);
} else {
for(BlockPos cursor : cursors) {
BlockPos pos = lookPos.getBlockPos().add(cursor);
Item item = heldItemStack.getItem();
if(!player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) {
if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) {
ItemStack saveHeld = heldItemStack.copy();
item.onItemUse(player, player.world, pos, event.getHand(), lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ());
if (player.isCreative())
player.setHeldItem(event.getHand(), saveHeld);
if(heldItemStack.isEmpty()) {
event.setCanceled(true);
return;
}
}
}
}
@@ -22,6 +22,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -84,17 +85,25 @@ public final class SkyblockWorldEvents {
if(Math.random() < 0.8)
event.getEntityPlayer().dropItem(new ItemStack(ModItems.manaResource, 1, 21), false);
}
}
} else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL && !event.getWorld().isRemote) {
RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F);
if(RayTraceResult != null) {
if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) {
if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.WATER) {
equipped.shrink(1);
if(equipped.isEmpty())
event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl));
else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl));
event.setCanceled(true);
event.setCancellationResult(EnumActionResult.SUCCESS);
}
} else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) {
RayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F);
if(rtr != null) {
if (rtr.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) {
if(event.getWorld().getBlockState(rtr.getBlockPos()).getMaterial() == Material.WATER) {
if(!event.getWorld().isRemote) {
equipped.shrink(1);
if(equipped.isEmpty())
event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl));
else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl));
}
event.setCanceled(true);
event.setCancellationResult(EnumActionResult.SUCCESS);
}
}
}