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

Drop support for mutations

Browse Source
This commit is contained in:
Daniel Mills 2021-08-09 09:11:09 -04:00
parent 4cdac76ca5
commit 378f735e9f
2 changed files with 0 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java
View File

@ -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 <https://www.gnu.org/licenses/>.
*/
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<String> 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<String> 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<IrisObjectPlacement> objects = new KList<>();
private final transient AtomicCache<KList<String>> sideACache = new AtomicCache<>();
private final transient AtomicCache<KList<String>> sideBCache = new AtomicCache<>();
public KList<String> getRealSideA(DataProvider xg) {
return sideACache.aquire(() -> processList(xg, getSideA()));
}
public KList<String> getRealSideB(DataProvider xg) {
return sideBCache.aquire(() -> processList(xg, getSideB()));
}
public KList<String> processList(DataProvider xg, KList<String> s) {
KSet<String> 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);
}
}

5
src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java
View File

@ -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.InferredType;
import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiome;
import com.volmit.iris.engine.object.biome.IrisBiomeCustom; 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.IrisBlockDrops;
import com.volmit.iris.engine.object.block.IrisMaterialPalette; import com.volmit.iris.engine.object.block.IrisMaterialPalette;
import com.volmit.iris.engine.object.carve.IrisCarveLayer; import com.volmit.iris.engine.object.carve.IrisCarveLayer;
@ -330,10 +329,6 @@ public class IrisDimension extends IrisRegistrant {
@Desc("The palette of blocks for 'water'") @Desc("The palette of blocks for 'water'")
private IrisMaterialPalette fluidPalette = new IrisMaterialPalette().qclear().qadd("water"); private IrisMaterialPalette fluidPalette = new IrisMaterialPalette().qclear().qadd("water");
@ArrayType(min = 1, type = IrisBiomeMutation.class)
@Desc("Define biome mutations for this dimension")
private KList<IrisBiomeMutation> mutations = new KList<>();
@Desc("Cartographer map trade overrides") @Desc("Cartographer map trade overrides")
private IrisVillagerOverride patchCartographers = new IrisVillagerOverride().setDisableTrade(false); private IrisVillagerOverride patchCartographers = new IrisVillagerOverride().setDisableTrade(false);