Build 302

This commit is contained in:
Vincent Lee committed 2016-05-10 23:18:46 -05:00
1 parent 79e2ee7c0a
commit bf0712a75c
9 files changed
+17 -16

No files matched your search

+1 -1
View File
@@ -225,7 +225,7 @@ curseforge {
See https://github.com/williewillus/Botania/releases/tag/${version}
"""
releaseType = "beta"
addGameVersion '1.8.9'
addGameVersion '1.9'
addGameVersion 'Java 8'
relations {
requiredLibrary 'baubles'
+4 -4
View File
@@ -1,9 +1,9 @@
#
#Sat Apr 23 16:25:06 CDT 2016
#Tue May 10 19:59:05 CDT 2016
version=r1.8
dir_output=../Build Output/Botania/
dir_repo=./
mc_version=1.9
forge_version=12.16.1.1898
build_number=303
mc_version=1.9
dir_repo=./
build_number=304
mod_name=Botania
@@ -58,6 +58,7 @@ import vazkii.botania.common.core.handler.MethodHandles;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ItemManaTablet;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.network.EffectType;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
@@ -193,7 +194,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
}
PacketHandler.sendToNearby(worldObj, getPos(),
new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ()));
new PacketBotaniaEffect(EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ()));
}
@Override
@@ -266,7 +267,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
if(didSomething) {
if(ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(20) == 0) {
PacketHandler.sendToNearby(worldObj, getPos(),
new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0));
new PacketBotaniaEffect(EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0));
}
isDoingTransfer = outputting;
}
@@ -78,6 +78,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.network.EffectType;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
@@ -189,7 +190,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss {
if(!hasProperArena(world, pos)) {
PacketHandler.sendTo((EntityPlayerMP) player,
new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ()));
new PacketBotaniaEffect(EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ()));
player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED)));
return false;
@@ -23,6 +23,7 @@ import net.minecraft.util.math.RayTraceResult;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.common.Botania;
import vazkii.botania.common.network.EffectType;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
@@ -77,7 +78,7 @@ public class LensPaint extends Lens {
&& BotaniaAPI.paintableBlocks.get(block).getAllowedValues().contains(placeColor)) {
entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2);
PacketHandler.sendToNearby(entity.worldObj, coords,
new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata()));
new PacketBotaniaEffect(EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata()));
}
}
}
@@ -117,10 +117,9 @@ public class PacketBotaniaEffect implements IMessage {
return null;
}
}
public enum EffectType {
private enum EffectType {
POOL_CRAFT(0),
POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting
PAINT_LENS(1), // Arg: colour
@@ -131,7 +130,6 @@ public class PacketBotaniaEffect implements IMessage {
EffectType(int argCount) {
this.argCount = argCount;
}
}
}
@@ -1,6 +1,5 @@
package vazkii.botania.common.network;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.management.PlayerManager;
@@ -17,7 +16,7 @@ public final class PacketHandler {
private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.MOD_ID);
public static void init() {
HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, 0, Side.CLIENT);
HANDLER.registerMessage(HandlerBotaniaEffect.class, PacketBotaniaEffect.class, 0, Side.CLIENT);
}
/**
+1 -1
View File
@@ -1 +1 @@
r1.8-302
r1.8-303
+2 -1
View File
@@ -251,4 +251,5 @@ r1.8-299=1.8.9
r1.8-299=1.8.9
r1.8-300=1.9
r1.8-301=1.9
r1.8-302=1.9
r1.8-302=1.9
r1.8-303=1.9