From 65690387778a710f9d1c79cda9ff70035e0ef01e Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 9 Aug 2021 09:43:15 -0400 Subject: [PATCH] Drop par manager --- .../volmit/iris/core/project/IrisProject.java | 40 ------------------- .../iris/engine/IrisEngineParallax.java | 36 ----------------- .../iris/engine/mantle/EngineMantle.java | 1 - .../iris/engine/object/meta/IrisEffect.java | 5 ++- 4 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 src/main/java/com/volmit/iris/engine/IrisEngineParallax.java diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java index 7c0de8c13..227201dac 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -30,7 +30,6 @@ import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.core.tools.IrisWorldCreator; import com.volmit.iris.engine.framework.Engine; 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.block.IrisBlockData; 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 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> lookupObjects = renameObjects.flip(); StringBuilder gb = new StringBuilder(); 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())); c.append(IO.hash(b.toString())); b = new StringBuilder(); diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java b/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java deleted file mode 100644 index f5ce791ca..000000000 --- a/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java +++ /dev/null @@ -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 . - */ - -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(); - } -} diff --git a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java index 604b709e4..36f07ac07 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -23,7 +23,6 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.Cache; 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.object.biome.IrisBiome; import com.volmit.iris.engine.object.common.IObjectPlacer; diff --git a/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java index 3573dfb92..5146d97d5 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.object.meta; import com.volmit.iris.Iris; 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.util.math.RNG; import com.volmit.iris.util.scheduling.ChronoLatch; @@ -29,6 +29,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import net.minecraft.world.level.GeneratorAccess; import org.bukkit.Location; import org.bukkit.Particle; 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()) { return; }