mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #376 from VolmitSoftware/master

Browse Source 
Give me fixes
This commit is contained in:
Dan 2021-06-17 19:18:07 -08:00 committed by GitHub
commit 7c46ee50a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 152 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/volmit/iris/manager/ProjectManager.java
View File

@ -123,7 +123,7 @@ public class ProjectManager
catch(IOException e)
{
}
}
@ -232,15 +232,28 @@ public class ProjectManager
} catch (Throwable e){
e.printStackTrace();
sender.sendMessage(
"Issue when unpacking. Please check/do the following:" +
"\n1. Do you have a functioning internet connection?" +
"\n2. Did the download corrupt?" +
"\n3. Try deleting the */plugins/iris/packs folder and re-download." +
"\n4. Download the pack from the GitHub repo: https://github.com/IrisDimensions/overworld" +
"\n5. Contact support (if all other options do not help)"
"Issue when unpacking. Please check/do the following:" +
"\n1. Do you have a functioning internet connection?" +
"\n2. Did the download corrupt?" +
"\n3. Try deleting the */plugins/iris/packs folder and re-download." +
"\n4. Download the pack from the GitHub repo: https://github.com/IrisDimensions/overworld" +
"\n5. Contact support (if all other options do not help)"
);
}
File dir = work.listFiles().length == 1 && work.listFiles()[0].isDirectory() ? work.listFiles()[0] : null;
File dir = null;
File[] zipFiles = work.listFiles();
if (zipFiles == null) {
sender.sendMessage("No files were extracted from the zip file.");
return;
}
try {
dir = zipFiles.length == 1 && zipFiles[0].isDirectory() ? zipFiles[0] : null;
} catch (NullPointerException e) {
sender.sendMessage("Error when finding home directory. Are there any non-text characters in the file name?");
return;
}
if(dir == null)
{
@ -256,7 +269,11 @@ public class ProjectManager
return;
}
if(dimensions.listFiles().length != 1)
if(dimensions.listFiles() == null){
sender.sendMessage("No dimension file found in the extracted zip file.");
sender.sendMessage("Check it is there on GitHub and report this to staff!");
}
else if (dimensions.listFiles().length != 1)
{
sender.sendMessage("Dimensions folder must have 1 file in it");
return;
@ -515,4 +532,4 @@ public class ProjectManager
activeProject.updateWorkspace();
}
}
}
}

116
src/main/java/com/volmit/iris/object/tile/TileBanner.java Normal file
View File

@ -0,0 +1,116 @@
package com.volmit.iris.object.tile;
import lombok.Data;
import net.querz.nbt.tag.CompoundTag;
import net.querz.nbt.tag.ListTag;
import org.bukkit.DyeColor;
import org.bukkit.Material;
import org.bukkit.block.Banner;
import org.bukkit.block.banner.Pattern;
import org.bukkit.block.banner.PatternType;
import org.bukkit.block.data.BlockData;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@Data
public class TileBanner implements TileData<Banner> {
public static final int id = 2;
private List<Pattern> patterns = new ArrayList<Pattern>();
private DyeColor baseColor;
@Override
public String getTileId() {
return "minecraft:banner";
}
@Override
public boolean isApplicable(BlockData data) {
return isBanner(data.getMaterial());
}
@Override
public void toBukkit(Banner banner) {
banner.setPatterns(patterns);
banner.setBaseColor(baseColor);
}
@Override
public void fromBukkit(Banner banner) {
this.patterns = banner.getPatterns();
this.baseColor = banner.getBaseColor();
}
@Override
public TileBanner clone() {
TileBanner ts = new TileBanner();
ts.setBaseColor(getBaseColor());
ts.setPatterns(getPatterns());
return ts;
}
@Override
public void toBinary(DataOutputStream out) throws IOException {
out.writeShort(id);
out.writeByte(baseColor.ordinal());
out.writeByte(patterns.size());
for (Pattern p : patterns) {
out.writeByte(p.getColor().ordinal());
out.writeByte(p.getPattern().ordinal());
}
}
@Override
public void fromBinary(DataInputStream in) throws IOException {
baseColor = DyeColor.values()[in.readByte()];
int listSize = in.readByte();
patterns = new ArrayList<>();
for (int i = 0; i < listSize; i++) {
DyeColor color = DyeColor.values()[in.readByte()];
PatternType type = PatternType.values()[in.readByte()];
patterns.add(new Pattern(color, type));
}
}
@Override
public void toNBT(CompoundTag tag) {
ListTag<CompoundTag> listTag = (ListTag<CompoundTag>) ListTag.createUnchecked(CompoundTag.class);
for (Pattern p : patterns) {
CompoundTag pattern = new CompoundTag();
pattern.putString("Pattern", p.getPattern().getIdentifier());
pattern.putByte("Color", p.getColor().getDyeData());
listTag.add(pattern);
}
tag.put("Patterns", listTag);
}
public boolean isBanner(Material material) {
switch (material) {
case RED_BANNER: case RED_WALL_BANNER:
case ORANGE_BANNER: case ORANGE_WALL_BANNER:
case YELLOW_BANNER: case YELLOW_WALL_BANNER:
case LIME_BANNER: case LIME_WALL_BANNER:
case GREEN_BANNER: case GREEN_WALL_BANNER:
case CYAN_BANNER: case CYAN_WALL_BANNER:
case LIGHT_BLUE_BANNER: case LIGHT_BLUE_WALL_BANNER:
case BLUE_BANNER: case BLUE_WALL_BANNER:
case PURPLE_BANNER: case PURPLE_WALL_BANNER:
case MAGENTA_BANNER: case MAGENTA_WALL_BANNER:
case PINK_BANNER: case PINK_WALL_BANNER:
case WHITE_BANNER: case WHITE_WALL_BANNER:
case LIGHT_GRAY_BANNER: case LIGHT_GRAY_WALL_BANNER:
case GRAY_BANNER: case GRAY_WALL_BANNER:
case BLACK_BANNER: case BLACK_WALL_BANNER:
case BROWN_BANNER: case BROWN_WALL_BANNER:
return true;
default:
return false;
}
}
}

3
src/main/java/com/volmit/iris/object/tile/TileData.java
View File

@ -12,7 +12,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
public interface TileData<T extends TileState> extends Cloneable {
public static int id = 0;
public static final KList<TileData<? extends TileState>> registry = setup();
static KList<TileData<? extends TileState>> setup() {
@ -20,6 +20,7 @@ public interface TileData<T extends TileState> extends Cloneable {
registry.add(new TileSign());
registry.add(new TileSpawner());
registry.add(new TileBanner());
return registry;
}

2
src/main/java/com/volmit/iris/object/tile/TileSign.java
View File

@ -13,7 +13,7 @@ import java.io.IOException;
@Data
public class TileSign implements TileData<Sign> {
public static int id = TileData.id;
public static final int id = 0;
private String line1;
private String line2;
private String line3;

6
src/main/java/com/volmit/iris/object/tile/TileSpawner.java
View File

@ -3,9 +3,9 @@ package com.volmit.iris.object.tile;
import lombok.Data;
import net.querz.nbt.tag.CompoundTag;
import net.querz.nbt.tag.ListTag;
import org.bukkit.Material;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.type.WallSign;
import org.bukkit.entity.EntityType;
import java.io.DataInputStream;
@ -14,7 +14,7 @@ import java.io.IOException;
@Data
public class TileSpawner implements TileData<CreatureSpawner> {
public static int id = TileData.id;
public static final int id = 1;
private EntityType entityType;
@Override
@ -24,7 +24,7 @@ public class TileSpawner implements TileData<CreatureSpawner> {
@Override
public boolean isApplicable(BlockData data) {
return data instanceof org.bukkit.block.data.type.Sign || data instanceof WallSign;
return data.getMaterial() == Material.SPAWNER;
}
@Override

3
src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
View File

@ -526,6 +526,9 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
for(int i = 0; i < objectPlacement.getDensity(); i++)
{
IrisObject v = objectPlacement.getObject(getComplex(), rng);
if (v == null){
return;
}
int xx = rng.i(x, x+16);
int zz = rng.i(z, z+16);
int id = rng.i(0, Integer.MAX_VALUE);