EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-05 23:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Various Sponge changes

Browse Source 
- many improvements
- inventory utilities broke when updating to Sponge API 6.0.0
This commit is contained in:
MattBDev
2016-11-26 16:49:13 -05:00
parent 8d442f58d4
commit 62b353f82d
13 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
View File

@ -11,6 +11,7 @@ import org.spongepowered.api.command.CommandResult;
import org.spongepowered.api.command.CommandSource;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World;
import java.util.ArrayList;
@ -43,7 +44,7 @@ public class SpongeCommand implements CommandCallable {
}
@Override
public List<String> getSuggestions(CommandSource source, String arguments, org.spongepowered.api.world.Location<World> targetPosition)
public List<String> getSuggestions(CommandSource source, String arguments, Location<World> targetPosition)
throws CommandException {
if (!(source instanceof Player)) {
return null;

12
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java
View File

@ -11,12 +11,11 @@ import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.item.ItemTypes;
import org.spongepowered.api.item.inventory.Carrier;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.item.inventory.custom.CustomInventory;
import org.spongepowered.api.item.inventory.property.SlotIndex;
import org.spongepowered.api.item.inventory.type.CarriedInventory;
import java.util.ArrayList;
public class SpongeInventoryUtil extends InventoryUtil {
public ItemStack.Builder builder;
@ -27,11 +26,15 @@ public class SpongeInventoryUtil extends InventoryUtil {
@Override
public void open(final PlotInventory inv) {
/*
// TODO Auto-generated method stub
final SpongePlayer sp = (SpongePlayer) inv.player;
final Player player = sp.player;
final CustomInventory inventory = SpongeMain.THIS.getGame().getRegistry().createBuilder(CustomInventory.Builder.class).name(SpongeUtil.getTranslation(inv.getTitle())).size(inv.size).build();
final CustomInventory inventory = Inventory.builder().of(InventoryArchetypes.MENU_ROW)property("test",
InventoryTitle.of(org.spongepowered.api.text.Text.of(inv.getTitle())))
.property("size",org.spongepowered.api.item.inventory.property.InventoryDimension.)
//name(SpongeUtil.getTranslation(inv.getTitle())).size(inv.size).build();
final PlotItemStack[] items = inv.getItems();
for (int i = 0; i < (inv.size * 9); i++) {
final PlotItemStack item = items[i];
@ -41,6 +44,9 @@ public class SpongeInventoryUtil extends InventoryUtil {
}
inv.player.setMeta("inventory", inv);
player.openInventory(inventory, SpongeUtil.CAUSE);
*/
throw new UnsupportedOperationException("Broken as of 1.11");
}
public ItemStack getItem(final PlotItemStack item) {

4
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java
View File

@ -8,8 +8,8 @@ import org.spongepowered.api.text.title.Title;
public class SpongeTitleManager extends AbstractTitle {
@Override
public void sendTitle(final PlotPlayer player, final String head, final String sub, final int in, final int delay, final int out) {
final Title title = Title.builder().title(SpongeUtil.getText(head)).subtitle(SpongeUtil.getText(sub)).fadeIn(in * 20).stay(delay * 20).fadeOut(out * 20).build();
public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
Title title = Title.builder().title(SpongeUtil.getText(head)).subtitle(SpongeUtil.getText(sub)).fadeIn(in * 20).stay(delay * 20).fadeOut(out * 20).build();
((SpongePlayer) player).player.sendTitle(title);
}
}

4
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
View File

@ -339,7 +339,7 @@ public class SpongeUtil extends WorldUtil {
@Override
public String getBiome(String world, int x, int z) {
return SpongeUtil.getWorld(world).getBiome(x, z).getName().toUpperCase();
return SpongeUtil.getWorld(world).getBiome(x, 0, z).getName().toUpperCase();
}
@Override
@ -454,7 +454,7 @@ public class SpongeUtil extends WorldUtil {
BiomeType biome = SpongeUtil.getBiome(biomename);
for (int x = region.minX; x <= region.maxX; x++) {
for (int z = region.minZ; z <= region.maxZ; z++) {
world.setBiome(x, z, biome);
world.setBiome(x, 0, z, biome);
}
}
}

11
Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
View File

@ -4,23 +4,22 @@ import com.intellectualcrafters.plot.object.ChunkWrapper;
import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue;
import com.plotsquared.sponge.SpongeMain;
import com.plotsquared.sponge.util.SpongeUtil;
import org.spongepowered.api.world.biome.BiomeType;
import org.spongepowered.api.world.extent.MutableBiomeArea;
import org.spongepowered.api.world.extent.MutableBiomeVolume;
import org.spongepowered.api.world.extent.MutableBlockVolume;
public class GenChunk extends ScopedLocalBlockQueue {
private final MutableBlockVolume terrain;
private final MutableBiomeArea biome;
private final MutableBiomeVolume biome;
private final int bz;
private final int bx;
private final String world;
public boolean modified = false;
public GenChunk(MutableBlockVolume terrain, MutableBiomeArea biome, ChunkWrapper wrap) {
public GenChunk(MutableBlockVolume terrain, MutableBiomeVolume biome, ChunkWrapper wrap) {
super(null, new Location(null, 0, 0, 0), new Location(null, 15, 255, 15));
this.bx = wrap.x << 4;
this.bz = wrap.z << 4;
@ -37,7 +36,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
BiomeType biome = SpongeUtil.getBiome(biomeName.toUpperCase());
for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) {
this.biome.setBiome(this.bx + x, this.bz + z, biome);
this.biome.setBiome(this.bx + x, 0,this.bz + z, biome);
}
}
}
@ -46,7 +45,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
public boolean setBiome(int x, int z, String biomeName) {
modified = true;
BiomeType biome = SpongeUtil.getBiome(biomeName.toUpperCase());
this.biome.setBiome(this.bx + x, this.bz + z, biome);
this.biome.setBiome(this.bx + x, 0, this.bz + z, biome);
return true;
}