Skip to content

Commit

Permalink
Many random tweaks + More features for advanced Entity Spawnwer.
Browse files Browse the repository at this point in the history 
Signed-off-by: me4502 <mnmiller1@hotmail.com>
  • Loading branch information
@me4502
me4502 committed Nov 3, 2012
1 parent 9c9edd9 commit 318d4d1
Show file tree
Hide file tree
Showing 9 changed files with 127 additions and 58 deletions.
6 changes: 6 additions & 0 deletions circuits/src/main/java/com/sk89q/craftbook/bukkit/CircuitsPlugin.java
View file
Expand Up @@ -592,4 +592,10 @@ public void generateICDocs(Player player, String id) {
} catch (Exception ignored) {
}
}

@Override
public void reloadConfiguration() {
config = new CircuitsConfiguration(getConfig(), getDataFolder());
saveConfig();
}
}
2 changes: 1 addition & 1 deletion circuits/src/main/java/com/sk89q/craftbook/bukkit/commands/CircuitCommands.java
View file
Expand Up @@ -41,7 +41,7 @@ public void ic(CommandContext context, CommandSender sender) {
)
public void reload(CommandContext context, CommandSender sender) {

plugin.getICConfiguration().reload();
plugin.reloadConfig();
sender.sendMessage("The IC config has been reloaded.");
}

Expand Down
2 changes: 1 addition & 1 deletion circuits/src/main/java/com/sk89q/craftbook/gates/world/AdvancedEntitySpawner.java
View file
Expand Up @@ -134,7 +134,7 @@ public void trigger(ChipState chip) {
String[] data = bit.split(":");

if(data[0].equalsIgnoreCase("e"))
setEntityData(ent, data[1]);
setEntityData(ent, bit.replace(data[0] + ":", ""));
else if(data[0].equalsIgnoreCase("p")) {
//TODO potion effects
}
Expand Down
82 changes: 42 additions & 40 deletions circuits/src/main/java/com/sk89q/craftbook/gates/world/CreatureSpawner.java
View file
Expand Up @@ -101,115 +101,117 @@ public void trigger(ChipState chip) {
}
}

public void setEntityData(Entity ent, String data) {
public void setEntityData(Entity ent, String bit) {

if (ent instanceof Ageable && data.equalsIgnoreCase("baby")) {
String[] data = bit.split(":");

if (ent instanceof Ageable && data[0].equalsIgnoreCase("baby")) {
((Ageable) ent).setBaby();
}

if (ent instanceof Ageable && data.equalsIgnoreCase("babylock")) {
if (ent instanceof Ageable && data[0].equalsIgnoreCase("babylock")) {
((Ageable) ent).setBaby();
((Ageable) ent).setAgeLock(true);
}


switch (ent.getType()) {
case CREEPER:
if (data.equalsIgnoreCase("charged")) {
if (data[0].equalsIgnoreCase("charged")) {
((Creeper) ent).setPowered(true);
}
break;
case SLIME:
if (data.equalsIgnoreCase("huge")) {
if (data[0].equalsIgnoreCase("huge")) {
((Slime) ent).setSize(16);
} else if (data.equalsIgnoreCase("large")) {
} else if (data[0].equalsIgnoreCase("large")) {
((Slime) ent).setSize(11);
} else if (data.equalsIgnoreCase("normal")) {
} else if (data[0].equalsIgnoreCase("normal")) {
((Slime) ent).setSize(6);
} else if (data.equalsIgnoreCase("small")) {
} else if (data[0].equalsIgnoreCase("small")) {
((Slime) ent).setSize(3);
} else {
} else if (data[0].equalsIgnoreCase("size")){
try {
int size = Integer.parseInt(data);
int size = Integer.parseInt(data[1]);
((Slime) ent).setSize(size);
}
catch(Exception e){}
}
break;
case MAGMA_CUBE:
if (data.equalsIgnoreCase("huge")) {
if (data[0].equalsIgnoreCase("huge")) {
((MagmaCube) ent).setSize(16);
} else if (data.equalsIgnoreCase("large")) {
} else if (data[0].equalsIgnoreCase("large")) {
((MagmaCube) ent).setSize(11);
} else if (data.equalsIgnoreCase("normal")) {
} else if (data[0].equalsIgnoreCase("normal")) {
((MagmaCube) ent).setSize(6);
} else if (data.equalsIgnoreCase("small")) {
} else if (data[0].equalsIgnoreCase("small")) {
((MagmaCube) ent).setSize(3);
} else {
} else if (data[0].equalsIgnoreCase("size")){
try {
int size = Integer.parseInt(data);
int size = Integer.parseInt(data[1]);
((MagmaCube) ent).setSize(size);
}
catch(Exception e){}
}
break;
case WOLF:
if (data.equalsIgnoreCase("tame")) {
if (data[0].equalsIgnoreCase("tame")) {
((Wolf) ent).setTamed(true);
} else if (data.equalsIgnoreCase("angry")) {
} else if (data[0].equalsIgnoreCase("angry")) {
((Wolf) ent).setAngry(true);
}
break;
case PIG_ZOMBIE:
if (data.equalsIgnoreCase("angry")) {
if (data[0].equalsIgnoreCase("angry")) {
((PigZombie) ent).setAngry(true);
}
break;
case VILLAGER:
if (data.equalsIgnoreCase("butcher")) {
if (data[0].equalsIgnoreCase("butcher")) {
((Villager) ent).setProfession(Villager.Profession.BUTCHER);
} else if (data.equalsIgnoreCase("smith")) {
} else if (data[0].equalsIgnoreCase("smith")) {
((Villager) ent).setProfession(Villager.Profession.BLACKSMITH);
} else if (data.equalsIgnoreCase("priest")) {
} else if (data[0].equalsIgnoreCase("priest")) {
((Villager) ent).setProfession(Villager.Profession.PRIEST);
} else if (data.equalsIgnoreCase("library")) {
} else if (data[0].equalsIgnoreCase("library")) {
((Villager) ent).setProfession(Villager.Profession.LIBRARIAN);
} else if (data.equalsIgnoreCase("farmer")) {
} else if (data[0].equalsIgnoreCase("farmer")) {
((Villager) ent).setProfession(Villager.Profession.FARMER);
}
break;
case SHEEP:
if (data.equalsIgnoreCase("black")) {
if (data[0].equalsIgnoreCase("black")) {
((Sheep) ent).setColor(DyeColor.BLACK);
} else if (data.equalsIgnoreCase("red")) {
} else if (data[0].equalsIgnoreCase("red")) {
((Sheep) ent).setColor(DyeColor.RED);
} else if (data.equalsIgnoreCase("green")) {
} else if (data[0].equalsIgnoreCase("green")) {
((Sheep) ent).setColor(DyeColor.GREEN);
} else if (data.equalsIgnoreCase("brown")) {
} else if (data[0].equalsIgnoreCase("brown")) {
((Sheep) ent).setColor(DyeColor.BROWN);
} else if (data.equalsIgnoreCase("blue")) {
} else if (data[0].equalsIgnoreCase("blue")) {
((Sheep) ent).setColor(DyeColor.BLUE);
} else if (data.equalsIgnoreCase("purple")) {
} else if (data[0].equalsIgnoreCase("purple")) {
((Sheep) ent).setColor(DyeColor.PURPLE);
} else if (data.equalsIgnoreCase("cyan")) {
} else if (data[0].equalsIgnoreCase("cyan")) {
((Sheep) ent).setColor(DyeColor.CYAN);
} else if (data.equalsIgnoreCase("silver")) {
} else if (data[0].equalsIgnoreCase("silver")) {
((Sheep) ent).setColor(DyeColor.SILVER);
} else if (data.equalsIgnoreCase("gray")) {
} else if (data[0].equalsIgnoreCase("gray")) {
((Sheep) ent).setColor(DyeColor.GRAY);
} else if (data.equalsIgnoreCase("pink")) {
} else if (data[0].equalsIgnoreCase("pink")) {
((Sheep) ent).setColor(DyeColor.PINK);
} else if (data.equalsIgnoreCase("lime")) {
} else if (data[0].equalsIgnoreCase("lime")) {
((Sheep) ent).setColor(DyeColor.LIME);
} else if (data.equalsIgnoreCase("yellow")) {
} else if (data[0].equalsIgnoreCase("yellow")) {
((Sheep) ent).setColor(DyeColor.YELLOW);
} else if (data.equalsIgnoreCase("lblue")) {
} else if (data[0].equalsIgnoreCase("lblue")) {
((Sheep) ent).setColor(DyeColor.LIGHT_BLUE);
} else if (data.equalsIgnoreCase("magenta")) {
} else if (data[0].equalsIgnoreCase("magenta")) {
((Sheep) ent).setColor(DyeColor.MAGENTA);
} else if (data.equalsIgnoreCase("orange")) {
} else if (data[0].equalsIgnoreCase("orange")) {
((Sheep) ent).setColor(DyeColor.ORANGE);
} else if (data.equalsIgnoreCase("white")) {
} else if (data[0].equalsIgnoreCase("white")) {
((Sheep) ent).setColor(DyeColor.WHITE);
}
break;
Expand Down
4 changes: 3 additions & 1 deletion common/src/main/java/com/sk89q/craftbook/bukkit/BaseBukkitPlugin.java
View file
Expand Up @@ -327,4 +327,6 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command cmd, S

return true;
}
}

public abstract void reloadConfiguration();
}
6 changes: 6 additions & 0 deletions common/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java
View file
Expand Up @@ -98,4 +98,10 @@ public void reload(CommandContext context, CommandSender sender) {
sender.sendMessage("The CraftBook Common config has been reloaded.");
}
}

@Override
public void reloadConfiguration() {
config = new CommonConfiguration(getConfig(), getDataFolder());
saveConfig();
}
}
44 changes: 38 additions & 6 deletions mechanisms/src/main/java/com/sk89q/craftbook/bukkit/MechanismsPlugin.java
View file
Expand Up @@ -18,20 +18,46 @@

package com.sk89q.craftbook.bukkit;

import com.sk89q.craftbook.*;
import net.milkbowl.vault.economy.Economy;

import org.bukkit.Chunk;
import org.bukkit.World;
import org.bukkit.plugin.RegisteredServiceProvider;

import com.sk89q.craftbook.LanguageManager;
import com.sk89q.craftbook.Mechanic;
import com.sk89q.craftbook.MechanicFactory;
import com.sk89q.craftbook.MechanicManager;
import com.sk89q.craftbook.MechanismsConfiguration;
import com.sk89q.craftbook.bukkit.Metrics.Graph;
import com.sk89q.craftbook.bukkit.commands.MechanismCommands;
import com.sk89q.craftbook.mech.*;
import com.sk89q.craftbook.mech.AIMechanic;
import com.sk89q.craftbook.mech.Ammeter;
import com.sk89q.craftbook.mech.Bookcase;
import com.sk89q.craftbook.mech.Bridge;
import com.sk89q.craftbook.mech.Cauldron;
import com.sk89q.craftbook.mech.ChunkAnchor;
import com.sk89q.craftbook.mech.Command;
import com.sk89q.craftbook.mech.CookingPot;
import com.sk89q.craftbook.mech.CustomDrops;
import com.sk89q.craftbook.mech.Door;
import com.sk89q.craftbook.mech.Elevator;
import com.sk89q.craftbook.mech.Gate;
import com.sk89q.craftbook.mech.HiddenSwitch;
import com.sk89q.craftbook.mech.LightStone;
import com.sk89q.craftbook.mech.LightSwitch;
import com.sk89q.craftbook.mech.MapChanger;
import com.sk89q.craftbook.mech.PaintingSwitch;
import com.sk89q.craftbook.mech.Payment;
import com.sk89q.craftbook.mech.Snow;
import com.sk89q.craftbook.mech.Teleporter;
import com.sk89q.craftbook.mech.XPStorer;
import com.sk89q.craftbook.mech.area.Area;
import com.sk89q.craftbook.mech.area.CopyManager;
import com.sk89q.craftbook.mech.cauldron.ImprovedCauldron;
import com.sk89q.craftbook.mech.crafting.CustomCrafting;
import com.sk89q.craftbook.mech.dispenser.DispenserRecipes;
import com.sk89q.craftbook.mech.dispenser.Recipe;
import net.milkbowl.vault.economy.Economy;
import org.bukkit.Chunk;
import org.bukkit.World;
import org.bukkit.plugin.RegisteredServiceProvider;


/**
Expand Down Expand Up @@ -299,4 +325,10 @@ public boolean registerDispenserRecipe(Recipe recipe) {

return getLocalConfiguration().dispenserSettings.enable && dRecipes.addRecipe(recipe);
}

@Override
public void reloadConfiguration() {
config = new MechanismsConfiguration(getConfig(), getDataFolder());
saveConfig();
}
}
5 changes: 3 additions & 2 deletions mechanisms/src/main/java/com/sk89q/craftbook/bukkit/commands/MechanismCommands.java
View file
@@ -1,11 +1,12 @@
package com.sk89q.craftbook.bukkit.commands;

import org.bukkit.command.CommandSender;

import com.sk89q.craftbook.bukkit.MechanismsPlugin;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.NestedCommand;
import org.bukkit.command.CommandSender;

/**
* @author Silthus
Expand Down Expand Up @@ -62,7 +63,7 @@ public NestedCommands(MechanismsPlugin plugin) {
@CommandPermissions("craftbook.mech.reload")
public void reload(CommandContext context, CommandSender sender) {

plugin.getLocalConfiguration().reload();
plugin.reloadConfig();
sender.sendMessage("Config has been reloaded successfully!");
}
}
Expand Down
34 changes: 27 additions & 7 deletions vehicles/src/main/java/com/sk89q/craftbook/bukkit/VehiclesPlugin.java
View file
Expand Up @@ -18,26 +18,40 @@

package com.sk89q.craftbook.bukkit;

import com.sk89q.craftbook.*;
import com.sk89q.craftbook.bukkit.Metrics.Graph;
import com.sk89q.craftbook.cart.CartMechanism;
import com.sk89q.craftbook.cart.MinecartManager;
import com.sk89q.worldedit.blocks.ItemID;
import org.bukkit.Bukkit;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.*;
import org.bukkit.entity.Boat;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Minecart;
import org.bukkit.entity.Player;
import org.bukkit.entity.Vehicle;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockRedstoneEvent;
import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.event.vehicle.*;
import org.bukkit.event.vehicle.VehicleCreateEvent;
import org.bukkit.event.vehicle.VehicleDestroyEvent;
import org.bukkit.event.vehicle.VehicleEnterEvent;
import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
import org.bukkit.event.vehicle.VehicleExitEvent;
import org.bukkit.event.vehicle.VehicleMoveEvent;
import org.bukkit.event.world.ChunkLoadEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;

import com.sk89q.craftbook.InsufficientPermissionsException;
import com.sk89q.craftbook.LanguageManager;
import com.sk89q.craftbook.LocalPlayer;
import com.sk89q.craftbook.SourcedBlockRedstoneEvent;
import com.sk89q.craftbook.VehiclesConfiguration;
import com.sk89q.craftbook.bukkit.Metrics.Graph;
import com.sk89q.craftbook.cart.CartMechanism;
import com.sk89q.craftbook.cart.MinecartManager;
import com.sk89q.worldedit.blocks.ItemID;

/**
* Plugin for CraftBook's redstone additions.
*
Expand Down Expand Up @@ -312,6 +326,12 @@ public void onSignChange(SignChangeEvent event) {
}
}

@Override
public void reloadConfiguration() {
config = new VehiclesConfiguration(getConfig(), getDataFolder());
saveConfig();
}

class Decay implements Runnable {

Minecart cart;
Expand Down

0 comments on commit 318d4d1

Please sign in to comment.