mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-07-18 18:23:06 +00:00
Drop par manager
This commit is contained in:
parent
075aec3ac0
commit
6569038777
@ -30,7 +30,6 @@ import com.volmit.iris.core.tools.IrisToolbelt;
|
|||||||
import com.volmit.iris.core.tools.IrisWorldCreator;
|
import com.volmit.iris.core.tools.IrisWorldCreator;
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.object.biome.IrisBiome;
|
import com.volmit.iris.engine.object.biome.IrisBiome;
|
||||||
import com.volmit.iris.engine.object.biome.IrisBiomeMutation;
|
|
||||||
import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;
|
import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;
|
||||||
import com.volmit.iris.engine.object.block.IrisBlockData;
|
import com.volmit.iris.engine.object.block.IrisBlockData;
|
||||||
import com.volmit.iris.engine.object.dimensional.IrisDimension;
|
import com.volmit.iris.engine.object.dimensional.IrisDimension;
|
||||||
@ -411,27 +410,6 @@ public class IrisProject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (IrisBiomeMutation i : dimension.getMutations()) {
|
|
||||||
for (IrisObjectPlacement j : i.getObjects()) {
|
|
||||||
b.append(j.hashCode());
|
|
||||||
KList<String> newNames = new KList<>();
|
|
||||||
|
|
||||||
for (String k : j.getPlace()) {
|
|
||||||
if (renameObjects.containsKey(k)) {
|
|
||||||
newNames.add(renameObjects.get(k));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
String name = !obfuscate ? k : UUID.randomUUID().toString().replaceAll("-", "");
|
|
||||||
b.append(name);
|
|
||||||
newNames.add(name);
|
|
||||||
renameObjects.put(k, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
j.setPlace(newNames);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
KMap<String, KList<String>> lookupObjects = renameObjects.flip();
|
KMap<String, KList<String>> lookupObjects = renameObjects.flip();
|
||||||
StringBuilder gb = new StringBuilder();
|
StringBuilder gb = new StringBuilder();
|
||||||
ChronoLatch cl = new ChronoLatch(1000);
|
ChronoLatch cl = new ChronoLatch(1000);
|
||||||
@ -455,24 +433,6 @@ public class IrisProject {
|
|||||||
}
|
}
|
||||||
})));
|
})));
|
||||||
|
|
||||||
dimension.getMutations().forEach((i) -> i.getObjects().forEach((j) -> j.getPlace().forEach((k) ->
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
File f = dm.getObjectLoader().findFile(lookupObjects.get(k).get(0));
|
|
||||||
IO.copyFile(f, new File(folder, "objects/" + k + ".iob"));
|
|
||||||
gb.append(IO.hash(f));
|
|
||||||
ggg.set(ggg.get() + 1);
|
|
||||||
|
|
||||||
if (cl.flip()) {
|
|
||||||
int g = ggg.get();
|
|
||||||
ggg.set(0);
|
|
||||||
sender.sendMessage("Wrote another " + g + " Objects");
|
|
||||||
}
|
|
||||||
} catch (Throwable e) {
|
|
||||||
Iris.reportError(e);
|
|
||||||
}
|
|
||||||
})));
|
|
||||||
|
|
||||||
b.append(IO.hash(gb.toString()));
|
b.append(IO.hash(gb.toString()));
|
||||||
c.append(IO.hash(b.toString()));
|
c.append(IO.hash(b.toString()));
|
||||||
b = new StringBuilder();
|
b = new StringBuilder();
|
||||||
|
@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* Iris is a World Generator for Minecraft Bukkit Servers
|
|
||||||
* Copyright (c) 2021 Arcane Arts (Volmit Software)
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.volmit.iris.engine;
|
|
||||||
|
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
|
||||||
import com.volmit.iris.engine.framework.EngineParallaxManager;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
public class IrisEngineParallax implements EngineParallaxManager {
|
|
||||||
@Getter
|
|
||||||
private final Engine engine;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
private final int parallaxSize;
|
|
||||||
|
|
||||||
public IrisEngineParallax(Engine engine) {
|
|
||||||
this.engine = engine;
|
|
||||||
parallaxSize = computeParallaxSize();
|
|
||||||
}
|
|
||||||
}
|
|
@ -23,7 +23,6 @@ import com.volmit.iris.core.project.loader.IrisData;
|
|||||||
import com.volmit.iris.engine.IrisComplex;
|
import com.volmit.iris.engine.IrisComplex;
|
||||||
import com.volmit.iris.engine.data.cache.Cache;
|
import com.volmit.iris.engine.data.cache.Cache;
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.framework.EngineParallaxManager;
|
|
||||||
import com.volmit.iris.engine.framework.EngineTarget;
|
import com.volmit.iris.engine.framework.EngineTarget;
|
||||||
import com.volmit.iris.engine.object.biome.IrisBiome;
|
import com.volmit.iris.engine.object.biome.IrisBiome;
|
||||||
import com.volmit.iris.engine.object.common.IObjectPlacer;
|
import com.volmit.iris.engine.object.common.IObjectPlacer;
|
||||||
|
@ -20,7 +20,7 @@ package com.volmit.iris.engine.object.meta;
|
|||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.engine.data.cache.AtomicCache;
|
import com.volmit.iris.engine.data.cache.AtomicCache;
|
||||||
import com.volmit.iris.engine.framework.GeneratorAccess;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.object.annotations.*;
|
import com.volmit.iris.engine.object.annotations.*;
|
||||||
import com.volmit.iris.util.math.RNG;
|
import com.volmit.iris.util.math.RNG;
|
||||||
import com.volmit.iris.util.scheduling.ChronoLatch;
|
import com.volmit.iris.util.scheduling.ChronoLatch;
|
||||||
@ -29,6 +29,7 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
|
import net.minecraft.world.level.GeneratorAccess;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Particle;
|
import org.bukkit.Particle;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
@ -202,7 +203,7 @@ public class IrisEffect {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void apply(Player p, GeneratorAccess g) {
|
public void apply(Player p, Engine g) {
|
||||||
if (!canTick()) {
|
if (!canTick()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user