From 378f735e9f27d5f160161a1e952b17e97305ff44 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 9 Aug 2021 09:11:09 -0400 Subject: [PATCH] Drop support for mutations --- .../object/biome/IrisBiomeMutation.java | 104 ------------------ .../object/dimensional/IrisDimension.java | 5 - 2 files changed, 109 deletions(-) delete mode 100644 src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java deleted file mode 100644 index b0b01981c..000000000 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java +++ /dev/null @@ -1,104 +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.object.biome; - -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KSet; -import com.volmit.iris.util.data.DataProvider; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@Desc("A biome mutation if a condition is met") -@Data -public class IrisBiomeMutation { - @RegistryListResource(IrisBiome.class) - @Required - @ArrayType(min = 1, type = String.class) - @Desc("One of The following biomes or regions must show up") - private KList sideA = new KList<>(); - - @RegistryListResource(IrisBiome.class) - @Required - @ArrayType(min = 1, type = String.class) - @Desc("One of The following biomes or regions must show up") - private KList sideB = new KList<>(); - - @Required - @MinNumber(1) - @MaxNumber(1024) - @Desc("The scan radius for placing this mutator") - private int radius = 16; - - @Required - @MinNumber(1) - @MaxNumber(32) - @Desc("How many tries per chunk to check for this mutation") - private int checks = 2; - - @RegistryListResource(IrisObject.class) - @ArrayType(min = 1, type = IrisObjectPlacement.class) - @Desc("Objects define what schematics (iob files) iris will place in this biome mutation") - private KList objects = new KList<>(); - - private final transient AtomicCache> sideACache = new AtomicCache<>(); - private final transient AtomicCache> sideBCache = new AtomicCache<>(); - - public KList getRealSideA(DataProvider xg) { - return sideACache.aquire(() -> processList(xg, getSideA())); - } - - public KList getRealSideB(DataProvider xg) { - return sideBCache.aquire(() -> processList(xg, getSideB())); - } - - public KList processList(DataProvider xg, KList s) { - KSet r = new KSet<>(); - - for (String i : s) { - - if (i.startsWith("^")) { - r.addAll(xg.getData().getRegionLoader().load(i.substring(1)).getLandBiomes()); - } else if (i.startsWith("*")) { - String name = i.substring(1); - r.addAll(xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)); - } else if (i.startsWith("!")) { - r.remove(i.substring(1)); - } else if (i.startsWith("!*")) { - String name = i.substring(2); - - for (String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)) { - r.remove(g); - } - } else { - r.add(i); - } - } - - return new KList<>(r); - } -} diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java index f9d5ee6fb..35ce5e094 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java @@ -26,7 +26,6 @@ import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.biome.InferredType; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; -import com.volmit.iris.engine.object.biome.IrisBiomeMutation; import com.volmit.iris.engine.object.block.IrisBlockDrops; import com.volmit.iris.engine.object.block.IrisMaterialPalette; import com.volmit.iris.engine.object.carve.IrisCarveLayer; @@ -330,10 +329,6 @@ public class IrisDimension extends IrisRegistrant { @Desc("The palette of blocks for 'water'") private IrisMaterialPalette fluidPalette = new IrisMaterialPalette().qclear().qadd("water"); - @ArrayType(min = 1, type = IrisBiomeMutation.class) - @Desc("Define biome mutations for this dimension") - private KList mutations = new KList<>(); - @Desc("Cartographer map trade overrides") private IrisVillagerOverride patchCartographers = new IrisVillagerOverride().setDisableTrade(false);