Skip to content

1.21 Experimental #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
James-P-Bennett wants to merge 1 commit into
base: master
Choose a base branch
from
Open

1.21 Experimental #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 52 additions & 21 deletions src/main/java/io/github/thebusybiscuit/electricspawners/ElectricSpawner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Mob;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.inventory.ItemStack;
Expand All @@ -31,26 +32,28 @@
public class ElectricSpawner extends SimpleSlimefunItem<BlockTicker> implements EnergyNetComponent {

private static final int ENERGY_CONSUMPTION = 240;
private static int lifetime = 0;

private final EntityType entity;
private final boolean forceDisableAI;
private final boolean defaultDisabledAI;

public ElectricSpawner(ItemGroup category, String mob, EntityType type, Research research) {
// @formatter:off
public ElectricSpawner(ItemGroup category, String mob, EntityType type, Research research, boolean forceDisableAI, boolean defaultDisabledAI) {
super(category, new SlimefunItemStack("ELECTRIC_SPAWNER_" + mob, "db6bd9727abb55d5415265789d4f2984781a343c68dcaf57f554a5e9aa1cd",
"&ePowered Spawner &7(" + ChatUtils.humanize(mob) + ")",
"",
"&8\u21E8 &e\u26A1 &7Max Entity Cap: 6",
"&8\u21E8 &e\u26A1 &7512 J Buffer",
"&8\u21E8 &e\u26A1 &7240 J/Mob"
"&8\u21E8 &e\u26A1 &7240 J/Mob",
forceDisableAI ? "&8\u21E8 &c&lAI Forcefully Disabled" : ""
), RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {
null, SlimefunItems.PLUTONIUM, null,
SlimefunItems.ELECTRIC_MOTOR, new CustomItemStack(Material.SPAWNER, "&bReinforced Spawner", "&7Type: &b" + ChatUtils.humanize(type.toString())), SlimefunItems.ELECTRIC_MOTOR,
SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.LARGE_CAPACITOR, SlimefunItems.BLISTERING_INGOT_3
null, SlimefunItems.PLUTONIUM.item(), null,
SlimefunItems.ELECTRIC_MOTOR.item(), CustomItemStack.create(Material.SPAWNER, "&bReinforced Spawner", "&7Type: &b" + ChatUtils.humanize(type.toString())), SlimefunItems.ELECTRIC_MOTOR.item(),
SlimefunItems.BLISTERING_INGOT_3.item(), SlimefunItems.LARGE_CAPACITOR.item(), SlimefunItems.BLISTERING_INGOT_3.item()
});
// @formatter:on

this.entity = type;
this.forceDisableAI = forceDisableAI;
this.defaultDisabledAI = defaultDisabledAI;

addItemHandler(onBlockPlace());

Expand All @@ -59,29 +62,48 @@ SlimefunItems.ELECTRIC_MOTOR, new CustomItemStack(Material.SPAWNER, "&bReinforce
@Override
public void init() {
for (int i = 0; i < 9; i++) {
if (i != 4) {
addItem(i, new CustomItemStack(Material.LIGHT_GRAY_STAINED_GLASS_PANE, " "), (p, slot, item, action) -> false);
if (i != 4 && (!forceDisableAI && i != 7)) {
addItem(i, CustomItemStack.create(Material.LIGHT_GRAY_STAINED_GLASS_PANE, " "), (p, slot, item, action) -> false);
}
}
}

@Override
public void newInstance(BlockMenu menu, Block b) {
if (!BlockStorage.hasBlockInfo(b) || BlockStorage.getLocationInfo(b.getLocation(), "enabled") == null || BlockStorage.getLocationInfo(b.getLocation(), "enabled").equals("false")) {
menu.replaceExistingItem(4, new CustomItemStack(Material.GUNPOWDER, "&7Enabled: &4\u2718", "", "&e> Click to enable this Machine"));
menu.replaceExistingItem(4, CustomItemStack.create(Material.GUNPOWDER, "&7Enabled: &4\u2718", "", "&e> Click to enable this Machine"));
menu.addMenuClickHandler(4, (p, slot, item, action) -> {
BlockStorage.addBlockInfo(b, "enabled", "true");
newInstance(menu, b);
return false;
});
} else {
menu.replaceExistingItem(4, new CustomItemStack(Material.REDSTONE, "&7Enabled: &2\u2714", "", "&e> Click to disable this Machine"));
menu.replaceExistingItem(4, CustomItemStack.create(Material.REDSTONE, "&7Enabled: &2\u2714", "", "&e> Click to disable this Machine"));
menu.addMenuClickHandler(4, (p, slot, item, action) -> {
BlockStorage.addBlockInfo(b, "enabled", "false");
newInstance(menu, b);
return false;
});
}

if (!forceDisableAI) {
boolean disableAI = BlockStorage.getLocationInfo(b.getLocation(), "disable_ai") == null ?
defaultDisabledAI :
BlockStorage.getLocationInfo(b.getLocation(), "disable_ai").equals("true");

menu.replaceExistingItem(7, CustomItemStack.create(
disableAI ? Material.ZOMBIE_HEAD : Material.PLAYER_HEAD,
"&7Mob AI: " + (disableAI ? "&4Disabled" : "&2Enabled"),
"",
"&e> Click to toggle Mob AI"
));

menu.addMenuClickHandler(7, (p, slot, item, action) -> {
BlockStorage.addBlockInfo(b, "disable_ai", String.valueOf(!disableAI));
newInstance(menu, b);
return false;
});
}
}

@Override
Expand All @@ -100,13 +122,13 @@ public int[] getSlotsAccessedByItemTransport(ItemTransportFlow flow) {

private BlockPlaceHandler onBlockPlace() {
return new BlockPlaceHandler(false) {

@Override
public void onPlayerPlace(BlockPlaceEvent e) {
Block b = e.getBlock();
Player p = e.getPlayer();
BlockStorage.addBlockInfo(b, "enabled", "false");
BlockStorage.addBlockInfo(b, "owner", p.getUniqueId().toString());
BlockStorage.addBlockInfo(b, "disable_ai", String.valueOf(forceDisableAI || defaultDisabledAI));
}
};
}
Expand All @@ -115,8 +137,13 @@ public int getEnergyConsumption() {
return ENERGY_CONSUMPTION;
}

private static final long SPAWN_COOLDOWN_TICKS = 20L; // 1 second (20 ticks) This too fast?
private long lastSpawnTick = 0L;

protected void tick(Block b) {
if (lifetime % 3 != 0) {
long currentTick = b.getWorld().getFullTime();

if (currentTick - lastSpawnTick < SPAWN_COOLDOWN_TICKS) {
return;
}

Expand All @@ -132,36 +159,41 @@ protected void tick(Block b) {
for (Entity n : b.getWorld().getNearbyEntities(b.getLocation(), 4.0, 4.0, 4.0)) {
if (n.getType().equals(this.entity)) {
count++;

if (count > 6) {
return;
}
}
}

removeCharge(b.getLocation(), getEnergyConsumption());
b.getWorld().spawnEntity(new Location(b.getWorld(), b.getX() + 0.5D, b.getY() + 1.5D, b.getZ() + 0.5D), this.entity);
Location spawnLoc = new Location(b.getWorld(), b.getX() + 0.5D, b.getY() + 1.5D, b.getZ() + 0.5D);
Entity spawned = b.getWorld().spawnEntity(spawnLoc, this.entity);

if (spawned instanceof Mob) {
Mob mob = (Mob) spawned;
boolean disableAI = forceDisableAI ||
BlockStorage.getLocationInfo(b.getLocation(), "disable_ai").equals("true");
mob.setAware(!disableAI);
}
lastSpawnTick = currentTick;
}

@Override
public BlockTicker getItemHandler() {
return new BlockTicker() {

@Override
public void tick(Block b, SlimefunItem sf, Config data) {
ElectricSpawner.this.tick(b);
}

@Override
public void uniqueTick() {
lifetime++;
}

@Override
public boolean isSynchronized() {
return true;
}

};
}

Expand All @@ -174,5 +206,4 @@ public int getCapacity() {
public EnergyNetComponentType getEnergyComponentType() {
return EnergyNetComponentType.CONSUMER;
}

}
}
22 changes: 18 additions & 4 deletions src/main/java/io/github/thebusybiscuit/electricspawners/ElectricSpawners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,35 @@ public void onEnable() {
new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/ElectricSpawners/master").start();
}

ItemGroup itemGroup = new ItemGroup(new NamespacedKey(this, "electric_spawners"), new CustomItemStack(PlayerHead.getItemStack(PlayerSkin.fromHashCode("db6bd9727abb55d5415265789d4f2984781a343c68dcaf57f554a5e9aa1cd")), "&9Electric Spawners"));
boolean forceDisableAI = false;
boolean defaultDisabledAI = false;

if (cfg.contains("mob-ai.force-disable")) {
forceDisableAI = cfg.getBoolean("mob-ai.force-disable");
}
if (cfg.contains("mob-ai.default-disabled")) {
defaultDisabledAI = cfg.getBoolean("mob-ai.default-disabled");
}

ItemGroup itemGroup = new ItemGroup(new NamespacedKey(this, "electric_spawners"),
CustomItemStack.create(PlayerHead.getItemStack(PlayerSkin.fromHashCode("db6bd9727abb55d5415265789d4f2984781a343c68dcaf57f554a5e9aa1cd")),
"&9Electric Spawners"));
Research research = new Research(new NamespacedKey(this, "electric_spawners"), 4820, "Powered Spawners", 30);

for (String mob : cfg.getStringList("mobs")) {
try {
EntityType type = EntityType.valueOf(mob);
new ElectricSpawner(itemGroup, mob, type, research).register(this);
new ElectricSpawner(itemGroup, mob, type, research, forceDisableAI, defaultDisabledAI).register(this);
} catch (IllegalArgumentException x) {
getLogger().log(Level.WARNING, "An Error has occured while adding an Electric Spawner for the (posibly outdated or invalid) EntityType \"{0}\"", mob);
getLogger().log(Level.WARNING, "An Error has occurred while adding an Electric Spawner for the (possibly outdated or invalid) EntityType \"{0}\"", mob);
} catch (Exception x) {
getLogger().log(Level.SEVERE, x, () -> "An Error has occured while adding an Electric Spawner for the EntityType \"" + mob + "\"");
getLogger().log(Level.SEVERE, x, () -> "An Error has occurred while adding an Electric Spawner for the EntityType \"" + mob + "\"");
}
}

research.register();

saveDefaultConfig();
}

@Override
Expand Down