tangled
alpha
login
or
join now
codexarchonic.nekoweb.org
/
ProjectInfinity
0
fork
atom
Inspired by 2020's April Fools' 20w14infinite Snapshot, this mod brings endless randomly generated dimensions into Minecraft.
0
fork
atom
overview
issues
6
pulls
pipelines
sorted util classes into smaller packages
Lera
1 year ago
f11ab13a
4bb9aa03
+114
-104
64 changed files
expand all
collapse all
unified
split
common
src
main
java
net
lerariemann
infinity
InfinityMod.java
access
Timebombable.java
block
custom
AltarBlock.java
InfinityPortalBlock.java
entity
CosmicAltarBlockEntity.java
InfinityPortalBlockEntity.java
compat
ClothConfigFactory.java
dimensions
DimensionData.java
RandomBiome.java
RandomCarver.java
RandomDimension.java
RandomDimensionType.java
RandomFeaturesList.java
RandomMobsList.java
RandomNoisePreset.java
RandomStructure.java
RandomStructureSet.java
RandomText.java
features
RandomCrop.java
RandomDelta.java
RandomFloatingPatch.java
RandomShape.java
RandomSurfacePatch.java
RandomTree.java
RandomVegetation.java
RandomisedFeature.java
entity
custom
AntEntity.java
BishopEntity.java
features
TextFeature.java
iridescence
Iridescence.java
IridescentEffect.java
item
ChromaticItem.java
F4Item.java
HomeItem.java
mixin
core
NetherPortalBlockMixin.java
ServerPlayerEntityMixin.java
options
GameRendererMixin.java
PlayerManagerMixin.java
options
InfinityOptions.java
RandomInfinityOptions.java
registry
var
ModCommands.java
ModMaterialConditions.java
ModMaterialRules.java
ModPayloads.java
structure
LetterPiece.java
TextStructure.java
util
config
ConfigGenerator.java
ConfigManager.java
SurfaceRuleScanner.java
core
CommonIO.java
Easterizer.java
RandomProvider.java
WeighedStructure.java
loading
DimensionGrabber.java
JsonGrabber.java
ShaderLoader.java
teleport
InfinityPortal.java
PortalCreator.java
WarpLogic.java
var
BishopBattle.java
ColorLogic.java
TextData.java
fabric
src
main
java
net
lerariemann
infinity
util
fabric
ConfigManagerImpl.java
neoforge
src
main
java
net
lerariemann
infinity
util
neoforge
ConfigManagerImpl.java
+2
-2
common/src/main/java/net/lerariemann/infinity/InfinityMod.java
reviewed
···
5
5
import net.lerariemann.infinity.registry.core.*;
6
6
import net.lerariemann.infinity.registry.var.*;
7
7
import net.lerariemann.infinity.util.PlatformMethods;
8
8
-
import net.lerariemann.infinity.util.RandomProvider;
9
9
-
import net.lerariemann.infinity.util.ConfigManager;
8
8
+
import net.lerariemann.infinity.util.core.RandomProvider;
9
9
+
import net.lerariemann.infinity.util.config.ConfigManager;
10
10
import net.minecraft.server.MinecraftServer;
11
11
import net.minecraft.util.WorldSavePath;
12
12
import org.slf4j.Logger;
+1
-1
common/src/main/java/net/lerariemann/infinity/access/Timebombable.java
reviewed
···
1
1
package net.lerariemann.infinity.access;
2
2
3
3
import net.lerariemann.infinity.util.InfinityMethods;
4
4
-
import net.lerariemann.infinity.util.WarpLogic;
4
4
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
5
5
import net.lerariemann.infinity.registry.var.ModCriteria;
6
6
import net.minecraft.entity.damage.DamageSource;
7
7
import net.minecraft.entity.damage.DamageType;
+1
-1
common/src/main/java/net/lerariemann/infinity/block/custom/AltarBlock.java
reviewed
···
3
3
import net.lerariemann.infinity.block.entity.BiomeBottleBlockEntity;
4
4
import net.lerariemann.infinity.registry.core.ModBlocks;
5
5
import net.lerariemann.infinity.registry.var.ModCriteria;
6
6
-
import net.lerariemann.infinity.util.BishopBattle;
6
6
+
import net.lerariemann.infinity.util.var.BishopBattle;
7
7
import net.minecraft.block.*;
8
8
import net.minecraft.entity.player.PlayerEntity;
9
9
import net.minecraft.item.DyeItem;
+3
-3
common/src/main/java/net/lerariemann/infinity/block/custom/InfinityPortalBlock.java
reviewed
···
9
9
import net.lerariemann.infinity.item.PortalDataHolder;
10
10
import net.lerariemann.infinity.registry.core.ModItemFunctions;
11
11
import net.lerariemann.infinity.util.InfinityMethods;
12
12
-
import net.lerariemann.infinity.util.InfinityPortal;
13
13
-
import net.lerariemann.infinity.util.PortalCreator;
14
14
-
import net.lerariemann.infinity.util.RandomProvider;
12
12
+
import net.lerariemann.infinity.util.teleport.InfinityPortal;
13
13
+
import net.lerariemann.infinity.util.teleport.PortalCreator;
14
14
+
import net.lerariemann.infinity.util.core.RandomProvider;
15
15
import net.lerariemann.infinity.registry.core.ModEntities;
16
16
import net.lerariemann.infinity.entity.custom.ChaosPawn;
17
17
import net.lerariemann.infinity.registry.core.ModItems;
+1
-1
common/src/main/java/net/lerariemann/infinity/block/entity/CosmicAltarBlockEntity.java
reviewed
···
1
1
package net.lerariemann.infinity.block.entity;
2
2
3
3
import net.lerariemann.infinity.access.MinecraftServerAccess;
4
4
-
import net.lerariemann.infinity.util.ConfigGenerator;
4
4
+
import net.lerariemann.infinity.util.config.ConfigGenerator;
5
5
import net.lerariemann.infinity.registry.core.ModBlockEntities;
6
6
import net.minecraft.block.Block;
7
7
import net.minecraft.block.BlockState;
+1
-1
common/src/main/java/net/lerariemann/infinity/block/entity/InfinityPortalBlockEntity.java
reviewed
···
3
3
import net.lerariemann.infinity.options.PortalColorApplier;
4
4
import net.lerariemann.infinity.util.InfinityMethods;
5
5
import net.lerariemann.infinity.registry.core.ModBlockEntities;
6
6
-
import net.lerariemann.infinity.util.InfinityPortal;
6
6
+
import net.lerariemann.infinity.util.teleport.InfinityPortal;
7
7
import net.minecraft.block.BlockState;
8
8
import net.minecraft.nbt.NbtCompound;
9
9
import net.minecraft.nbt.NbtElement;
+1
-1
common/src/main/java/net/lerariemann/infinity/compat/ClothConfigFactory.java
reviewed
···
12
12
import net.fabricmc.api.EnvType;
13
13
import net.fabricmc.api.Environment;
14
14
import net.lerariemann.infinity.InfinityMod;
15
15
-
import net.lerariemann.infinity.util.CommonIO;
15
15
+
import net.lerariemann.infinity.util.core.CommonIO;
16
16
import net.lerariemann.infinity.util.InfinityMethods;
17
17
import net.minecraft.client.gui.screen.Screen;
18
18
import net.minecraft.client.resource.language.I18n;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/DimensionData.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
-
import net.lerariemann.infinity.util.CommonIO;
3
3
+
import net.lerariemann.infinity.util.core.CommonIO;
4
4
import net.minecraft.nbt.NbtCompound;
5
5
import net.minecraft.nbt.NbtList;
6
6
import net.minecraft.nbt.NbtString;
+3
-3
common/src/main/java/net/lerariemann/infinity/dimensions/RandomBiome.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
5
5
-
import net.lerariemann.infinity.util.RandomProvider;
6
6
-
import net.lerariemann.infinity.util.WeighedStructure;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.RandomProvider;
6
6
+
import net.lerariemann.infinity.util.core.WeighedStructure;
7
7
import net.minecraft.nbt.*;
8
8
9
9
import java.util.*;
+2
-2
common/src/main/java/net/lerariemann/infinity/dimensions/RandomCarver.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
5
5
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.RandomProvider;
6
6
import net.minecraft.nbt.NbtCompound;
7
7
import net.minecraft.nbt.NbtList;
8
8
import net.minecraft.nbt.NbtString;
+2
-2
common/src/main/java/net/lerariemann/infinity/dimensions/RandomDimension.java
reviewed
···
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.lerariemann.infinity.options.RandomInfinityOptions;
5
5
-
import net.lerariemann.infinity.util.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.CommonIO;
6
6
import net.lerariemann.infinity.util.InfinityMethods;
7
7
-
import net.lerariemann.infinity.util.RandomProvider;
7
7
+
import net.lerariemann.infinity.util.core.RandomProvider;
8
8
import net.minecraft.nbt.*;
9
9
import net.minecraft.registry.Registry;
10
10
import net.minecraft.registry.RegistryKey;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/RandomDimensionType.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
import net.minecraft.nbt.*;
6
6
7
7
import java.util.Random;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/RandomFeaturesList.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.dimensions.features.*;
4
4
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.RandomProvider;
5
5
import net.minecraft.nbt.NbtCompound;
6
6
import net.minecraft.nbt.NbtList;
7
7
import net.minecraft.nbt.NbtString;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/RandomMobsList.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
-
import net.lerariemann.infinity.util.RandomProvider;
3
3
+
import net.lerariemann.infinity.util.core.RandomProvider;
4
4
import net.minecraft.nbt.NbtCompound;
5
5
import net.minecraft.nbt.NbtList;
6
6
+2
-2
common/src/main/java/net/lerariemann/infinity/dimensions/RandomNoisePreset.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
5
5
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.RandomProvider;
6
6
import net.minecraft.nbt.*;
7
7
8
8
import java.io.IOException;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/RandomStructure.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
import net.minecraft.nbt.NbtCompound;
6
6
import net.minecraft.nbt.NbtList;
7
7
import net.minecraft.util.Identifier;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/RandomStructureSet.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
-
import net.lerariemann.infinity.util.CommonIO;
3
3
+
import net.lerariemann.infinity.util.core.CommonIO;
4
4
import net.minecraft.nbt.NbtCompound;
5
5
import net.minecraft.nbt.NbtList;
6
6
+2
-2
common/src/main/java/net/lerariemann/infinity/dimensions/RandomText.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.ConfigManager;
5
5
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.config.ConfigManager;
5
5
+
import net.lerariemann.infinity.util.core.RandomProvider;
6
6
import net.minecraft.nbt.NbtCompound;
7
7
import org.apache.commons.io.FileUtils;
8
8
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomCrop.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions.features;
2
2
3
3
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
4
4
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.RandomProvider;
5
5
import net.minecraft.nbt.NbtCompound;
6
6
import net.minecraft.nbt.NbtElement;
7
7
import net.minecraft.nbt.NbtList;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomDelta.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions.features;
2
2
3
3
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
4
4
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.RandomProvider;
5
5
import net.minecraft.nbt.NbtCompound;
6
6
7
7
public class RandomDelta extends RandomisedFeature {
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomFloatingPatch.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions.features;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
6
6
import net.minecraft.nbt.NbtCompound;
7
7
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomShape.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions.features;
2
2
3
3
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
4
4
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.RandomProvider;
5
5
import net.minecraft.nbt.NbtCompound;
6
6
import net.minecraft.nbt.NbtList;
7
7
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomSurfacePatch.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions.features;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
-
import net.lerariemann.infinity.util.CommonIO;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
6
6
import net.minecraft.nbt.NbtCompound;
7
7
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomTree.java
reviewed
···
1
1
package net.lerariemann.infinity.dimensions.features;
2
2
3
3
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
4
4
-
import net.lerariemann.infinity.util.RandomProvider;
4
4
+
import net.lerariemann.infinity.util.core.RandomProvider;
5
5
import net.minecraft.nbt.NbtCompound;
6
6
import net.minecraft.nbt.NbtList;
7
7
import net.minecraft.nbt.NbtString;
+1
-1
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomVegetation.java
reviewed
···
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
5
5
-
import net.lerariemann.infinity.util.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.CommonIO;
6
6
import net.minecraft.nbt.*;
7
7
8
8
public class RandomVegetation extends RandomisedFeature {
+2
-2
common/src/main/java/net/lerariemann/infinity/dimensions/features/RandomisedFeature.java
reviewed
···
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.lerariemann.infinity.dimensions.RandomDimension;
5
5
-
import net.lerariemann.infinity.util.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.CommonIO;
6
6
import net.lerariemann.infinity.dimensions.RandomFeaturesList;
7
7
import net.lerariemann.infinity.util.InfinityMethods;
8
8
-
import net.lerariemann.infinity.util.RandomProvider;
8
8
+
import net.lerariemann.infinity.util.core.RandomProvider;
9
9
import net.minecraft.nbt.*;
10
10
import net.minecraft.registry.RegistryKeys;
11
11
+1
-1
common/src/main/java/net/lerariemann/infinity/entity/custom/AntEntity.java
reviewed
···
1
1
package net.lerariemann.infinity.entity.custom;
2
2
3
3
import net.lerariemann.infinity.block.custom.AntBlock;
4
4
-
import net.lerariemann.infinity.util.BishopBattle;
4
4
+
import net.lerariemann.infinity.util.var.BishopBattle;
5
5
import net.minecraft.block.Block;
6
6
import net.minecraft.block.BlockState;
7
7
import net.minecraft.entity.EntityType;
+1
-1
common/src/main/java/net/lerariemann/infinity/entity/custom/BishopEntity.java
reviewed
···
1
1
package net.lerariemann.infinity.entity.custom;
2
2
3
3
-
import net.lerariemann.infinity.util.BishopBattle;
3
3
+
import net.lerariemann.infinity.util.var.BishopBattle;
4
4
import net.minecraft.entity.Entity;
5
5
import net.minecraft.entity.EntityType;
6
6
import net.minecraft.entity.ai.pathing.EntityNavigation;
+1
-1
common/src/main/java/net/lerariemann/infinity/features/TextFeature.java
reviewed
···
2
2
3
3
import com.mojang.serialization.Codec;
4
4
import com.mojang.serialization.codecs.RecordCodecBuilder;
5
5
-
import net.lerariemann.infinity.util.TextData;
5
5
+
import net.lerariemann.infinity.util.var.TextData;
6
6
import net.minecraft.block.BlockState;
7
7
import net.minecraft.util.math.BlockPos;
8
8
import net.minecraft.util.math.random.Random;
+2
-2
common/src/main/java/net/lerariemann/infinity/iridescence/Iridescence.java
reviewed
···
8
8
import net.lerariemann.infinity.registry.core.ModStatusEffects;
9
9
import net.lerariemann.infinity.registry.var.ModCriteria;
10
10
import net.lerariemann.infinity.registry.var.ModStats;
11
11
-
import net.lerariemann.infinity.util.CommonIO;
11
11
+
import net.lerariemann.infinity.util.core.CommonIO;
12
12
import net.lerariemann.infinity.util.PlatformMethods;
13
13
import net.lerariemann.infinity.entity.custom.ChaosCreeper;
14
14
import net.lerariemann.infinity.entity.custom.ChaosPawn;
15
15
import net.lerariemann.infinity.util.InfinityMethods;
16
16
-
import net.lerariemann.infinity.util.WarpLogic;
16
16
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
17
17
import net.minecraft.block.Block;
18
18
import net.minecraft.entity.EntityType;
19
19
import net.minecraft.entity.LivingEntity;
+1
-1
common/src/main/java/net/lerariemann/infinity/iridescence/IridescentEffect.java
reviewed
···
1
1
package net.lerariemann.infinity.iridescence;
2
2
3
3
import net.lerariemann.infinity.entity.custom.ChaosPawn;
4
4
-
import net.lerariemann.infinity.util.WarpLogic;
4
4
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
5
5
import net.lerariemann.infinity.registry.core.ModStatusEffects;
6
6
import net.minecraft.entity.LivingEntity;
7
7
import net.minecraft.entity.effect.InstantStatusEffect;
+1
-1
common/src/main/java/net/lerariemann/infinity/item/ChromaticItem.java
reviewed
···
3
3
import net.lerariemann.infinity.block.entity.ChromaticBlockEntity;
4
4
import net.lerariemann.infinity.block.entity.InfinityPortalBlockEntity;
5
5
import net.lerariemann.infinity.registry.core.ModComponentTypes;
6
6
-
import net.lerariemann.infinity.util.ColorLogic;
6
6
+
import net.lerariemann.infinity.util.var.ColorLogic;
7
7
import net.minecraft.block.Block;
8
8
import net.minecraft.block.BlockState;
9
9
import net.minecraft.component.ComponentMap;
+1
-1
common/src/main/java/net/lerariemann/infinity/item/F4Item.java
reviewed
···
5
5
import net.lerariemann.infinity.registry.core.ModComponentTypes;
6
6
import net.lerariemann.infinity.registry.core.ModItems;
7
7
import net.lerariemann.infinity.util.InfinityMethods;
8
8
-
import net.lerariemann.infinity.util.InfinityPortal;
8
8
+
import net.lerariemann.infinity.util.teleport.InfinityPortal;
9
9
import net.minecraft.block.BlockState;
10
10
import net.minecraft.block.Blocks;
11
11
import net.minecraft.block.NetherPortalBlock;
+1
-1
common/src/main/java/net/lerariemann/infinity/item/HomeItem.java
reviewed
···
1
1
package net.lerariemann.infinity.item;
2
2
3
3
-
import net.lerariemann.infinity.util.WarpLogic;
3
3
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
4
4
import net.minecraft.entity.LivingEntity;
5
5
import net.minecraft.item.Item;
6
6
import net.minecraft.item.ItemStack;
+1
-1
common/src/main/java/net/lerariemann/infinity/loading/DimensionGrabber.java
common/src/main/java/net/lerariemann/infinity/util/loading/DimensionGrabber.java
reviewed
···
1
1
-
package net.lerariemann.infinity.loading;
1
1
+
package net.lerariemann.infinity.util.loading;
2
2
3
3
import com.mojang.serialization.Codec;
4
4
import net.lerariemann.infinity.dimensions.RandomDimension;
+2
-2
common/src/main/java/net/lerariemann/infinity/loading/JsonGrabber.java
common/src/main/java/net/lerariemann/infinity/util/loading/JsonGrabber.java
reviewed
···
1
1
-
package net.lerariemann.infinity.loading;
1
1
+
package net.lerariemann.infinity.util.loading;
2
2
3
3
import com.google.gson.JsonElement;
4
4
import com.google.gson.JsonParser;
5
5
import com.mojang.serialization.Codec;
6
6
import com.mojang.serialization.DataResult;
7
7
import com.mojang.serialization.JsonOps;
8
8
-
import net.lerariemann.infinity.util.CommonIO;
8
8
+
import net.lerariemann.infinity.util.core.CommonIO;
9
9
import net.lerariemann.infinity.util.InfinityMethods;
10
10
import net.minecraft.nbt.NbtCompound;
11
11
import net.minecraft.registry.*;
+1
-1
common/src/main/java/net/lerariemann/infinity/mixin/core/NetherPortalBlockMixin.java
reviewed
···
4
4
import net.lerariemann.infinity.registry.core.ModBlocks;
5
5
import net.lerariemann.infinity.block.entity.InfinityPortalBlockEntity;
6
6
import net.lerariemann.infinity.util.InfinityMethods;
7
7
-
import net.lerariemann.infinity.util.PortalCreator;
7
7
+
import net.lerariemann.infinity.util.teleport.PortalCreator;
8
8
import net.minecraft.block.Block;
9
9
import net.minecraft.block.BlockState;
10
10
import net.minecraft.block.Blocks;
+1
-1
common/src/main/java/net/lerariemann/infinity/mixin/core/ServerPlayerEntityMixin.java
reviewed
···
5
5
import net.lerariemann.infinity.access.ServerPlayerEntityAccess;
6
6
import net.lerariemann.infinity.options.InfinityOptions;
7
7
import net.lerariemann.infinity.util.InfinityMethods;
8
8
-
import net.lerariemann.infinity.util.WarpLogic;
8
8
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
9
9
import net.lerariemann.infinity.registry.var.ModPayloads;
10
10
import net.minecraft.entity.Entity;
11
11
import net.minecraft.entity.damage.DamageSource;
+1
-1
common/src/main/java/net/lerariemann/infinity/mixin/options/GameRendererMixin.java
reviewed
···
2
2
3
3
import net.lerariemann.infinity.access.GameRendererAccess;
4
4
import net.lerariemann.infinity.options.InfinityOptions;
5
5
-
import net.lerariemann.infinity.util.ShaderLoader;
5
5
+
import net.lerariemann.infinity.util.loading.ShaderLoader;
6
6
import net.minecraft.client.MinecraftClient;
7
7
import net.minecraft.client.render.GameRenderer;
8
8
import net.minecraft.resource.ResourceManager;
+1
-1
common/src/main/java/net/lerariemann/infinity/mixin/options/PlayerManagerMixin.java
reviewed
···
6
6
import net.lerariemann.infinity.registry.core.ModBlocks;
7
7
import net.lerariemann.infinity.registry.core.ModBlockEntities;
8
8
import net.lerariemann.infinity.util.InfinityMethods;
9
9
-
import net.lerariemann.infinity.util.WarpLogic;
9
9
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
10
10
import net.lerariemann.infinity.registry.var.ModPayloads;
11
11
import net.minecraft.block.BlockState;
12
12
import net.minecraft.network.ClientConnection;
+1
-1
common/src/main/java/net/lerariemann/infinity/options/InfinityOptions.java
reviewed
···
4
4
import net.fabricmc.api.Environment;
5
5
import net.lerariemann.infinity.InfinityMod;
6
6
import net.lerariemann.infinity.access.InfinityOptionsAccess;
7
7
-
import net.lerariemann.infinity.util.CommonIO;
7
7
+
import net.lerariemann.infinity.util.core.CommonIO;
8
8
import net.minecraft.client.MinecraftClient;
9
9
import net.minecraft.nbt.NbtCompound;
10
10
import net.minecraft.nbt.NbtElement;
+2
-2
common/src/main/java/net/lerariemann/infinity/options/RandomInfinityOptions.java
reviewed
···
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.lerariemann.infinity.dimensions.RandomDimension;
5
5
-
import net.lerariemann.infinity.util.RandomProvider;
6
6
-
import net.lerariemann.infinity.util.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.RandomProvider;
6
6
+
import net.lerariemann.infinity.util.core.CommonIO;
7
7
import net.minecraft.nbt.NbtCompound;
8
8
import net.minecraft.nbt.NbtList;
9
9
+1
-1
common/src/main/java/net/lerariemann/infinity/registry/var/ModCommands.java
reviewed
···
4
4
import com.mojang.brigadier.arguments.StringArgumentType;
5
5
import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
6
6
import dev.architectury.event.events.common.CommandRegistrationEvent;
7
7
-
import net.lerariemann.infinity.util.WarpLogic;
7
7
+
import net.lerariemann.infinity.util.teleport.WarpLogic;
8
8
import net.minecraft.command.argument.DimensionArgumentType;
9
9
import net.minecraft.server.command.CommandManager;
10
10
import net.minecraft.text.Text;
+1
-1
common/src/main/java/net/lerariemann/infinity/registry/var/ModMaterialConditions.java
reviewed
···
4
4
import com.mojang.serialization.MapCodec;
5
5
import com.mojang.serialization.codecs.RecordCodecBuilder;
6
6
import dev.architectury.registry.registries.DeferredRegister;
7
7
-
import net.lerariemann.infinity.util.TextData;
7
7
+
import net.lerariemann.infinity.util.var.TextData;
8
8
import net.minecraft.registry.RegistryKeys;
9
9
import net.minecraft.util.dynamic.CodecHolder;
10
10
import net.minecraft.world.gen.surfacebuilder.MaterialRules;
+1
-1
common/src/main/java/net/lerariemann/infinity/registry/var/ModMaterialRules.java
reviewed
···
6
6
import dev.architectury.registry.registries.DeferredRegister;
7
7
import net.lerariemann.infinity.iridescence.Iridescence;
8
8
import net.lerariemann.infinity.registry.core.ModBlocks;
9
9
-
import net.lerariemann.infinity.util.RandomProvider;
9
9
+
import net.lerariemann.infinity.util.core.RandomProvider;
10
10
import net.minecraft.block.BlockState;
11
11
import net.minecraft.block.Blocks;
12
12
import net.minecraft.block.LadderBlock;
+3
-3
common/src/main/java/net/lerariemann/infinity/registry/var/ModPayloads.java
reviewed
···
6
6
import net.lerariemann.infinity.access.InfinityOptionsAccess;
7
7
import net.lerariemann.infinity.access.WorldRendererAccess;
8
8
import net.lerariemann.infinity.iridescence.Iridescence;
9
9
-
import net.lerariemann.infinity.loading.DimensionGrabber;
9
9
+
import net.lerariemann.infinity.util.loading.DimensionGrabber;
10
10
import net.lerariemann.infinity.options.InfinityOptions;
11
11
import net.lerariemann.infinity.util.InfinityMethods;
12
12
-
import net.lerariemann.infinity.util.ShaderLoader;
13
13
-
import net.lerariemann.infinity.util.CommonIO;
12
12
+
import net.lerariemann.infinity.util.loading.ShaderLoader;
13
13
+
import net.lerariemann.infinity.util.core.CommonIO;
14
14
import net.minecraft.client.MinecraftClient;
15
15
import net.minecraft.nbt.NbtCompound;
16
16
import net.minecraft.network.RegistryByteBuf;
+1
-1
common/src/main/java/net/lerariemann/infinity/structure/LetterPiece.java
reviewed
···
1
1
package net.lerariemann.infinity.structure;
2
2
3
3
-
import net.lerariemann.infinity.util.TextData;
3
3
+
import net.lerariemann.infinity.util.var.TextData;
4
4
import net.lerariemann.infinity.registry.core.ModStructureTypes;
5
5
import net.minecraft.block.Blocks;
6
6
import net.minecraft.nbt.NbtCompound;
+1
-1
common/src/main/java/net/lerariemann/infinity/structure/TextStructure.java
reviewed
···
3
3
import com.mojang.serialization.Codec;
4
4
import com.mojang.serialization.MapCodec;
5
5
import com.mojang.serialization.codecs.RecordCodecBuilder;
6
6
-
import net.lerariemann.infinity.util.TextData;
6
6
+
import net.lerariemann.infinity.util.var.TextData;
7
7
import net.lerariemann.infinity.registry.core.ModStructureTypes;
8
8
import net.minecraft.structure.StructurePiecesCollector;
9
9
import net.minecraft.util.math.BlockPos;
+1
-1
common/src/main/java/net/lerariemann/infinity/util/BishopBattle.java
common/src/main/java/net/lerariemann/infinity/util/var/BishopBattle.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.var;
2
2
3
3
import net.lerariemann.infinity.entity.custom.AntEntity;
4
4
import net.lerariemann.infinity.entity.custom.BishopEntity;
+1
-1
common/src/main/java/net/lerariemann/infinity/util/ColorLogic.java
common/src/main/java/net/lerariemann/infinity/util/var/ColorLogic.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.var;
2
2
3
3
import net.minecraft.block.Block;
4
4
import net.minecraft.block.BlockState;
+1
-1
common/src/main/java/net/lerariemann/infinity/util/CommonIO.java
common/src/main/java/net/lerariemann/infinity/util/core/CommonIO.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.core;
2
2
3
3
import com.mojang.brigadier.exceptions.CommandSyntaxException;
4
4
import dev.architectury.platform.Platform;
+4
-2
common/src/main/java/net/lerariemann/infinity/util/ConfigGenerator.java
common/src/main/java/net/lerariemann/infinity/util/config/ConfigGenerator.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.config;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
5
5
+
import net.lerariemann.infinity.util.core.WeighedStructure;
4
6
import net.minecraft.block.Block;
5
7
import net.minecraft.block.BlockState;
6
8
import net.minecraft.block.FallingBlock;
···
39
41
import java.util.function.Function;
40
42
import java.util.stream.IntStream;
41
43
42
42
-
import static net.lerariemann.infinity.util.ConfigManager.getConfigDir;
44
44
+
import static net.lerariemann.infinity.util.config.ConfigManager.getConfigDir;
43
45
44
46
public interface ConfigGenerator {
45
47
static <T> NbtCompound wsToCompound(WeighedStructure<T> w) {
+2
-1
common/src/main/java/net/lerariemann/infinity/util/ConfigManager.java
common/src/main/java/net/lerariemann/infinity/util/config/ConfigManager.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.config;
2
2
3
3
import dev.architectury.platform.Platform;
4
4
import net.lerariemann.infinity.InfinityMod;
5
5
+
import net.lerariemann.infinity.util.core.CommonIO;
5
6
import net.minecraft.nbt.NbtCompound;
6
7
import net.minecraft.nbt.NbtElement;
7
8
import net.minecraft.nbt.NbtList;
+3
-4
common/src/main/java/net/lerariemann/infinity/util/Easterizer.java
common/src/main/java/net/lerariemann/infinity/util/core/Easterizer.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.core;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.lerariemann.infinity.dimensions.RandomDimension;
···
9
9
import java.nio.file.Paths;
10
10
import java.util.HashMap;
11
11
import java.util.Map;
12
12
-
import java.util.Set;
13
12
14
13
import static java.nio.file.Files.walk;
15
14
···
19
18
public Map<String, NbtCompound> optionmap;
20
19
public Map<String, Integer> colormap;
21
20
22
22
-
public Easterizer(RandomProvider prov) {
21
21
+
public Easterizer(String configPath) {
23
22
map = new HashMap<>();
24
23
optionmap = new HashMap<>();
25
24
colormap = new HashMap<>();
26
25
try {
27
27
-
walk(Paths.get(prov.configPath).resolve("easter")).forEach(p -> {
26
26
+
walk(Paths.get(configPath).resolve("easter")).forEach(p -> {
28
27
String fullname = p.toString();
29
28
if (p.toFile().isFile() && !fullname.endsWith("_type.json")) {
30
29
String name = p.getFileName().toString();
+2
-1
common/src/main/java/net/lerariemann/infinity/util/InfinityPortal.java
common/src/main/java/net/lerariemann/infinity/util/teleport/InfinityPortal.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.teleport;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.lerariemann.infinity.block.entity.InfinityPortalBlockEntity;
5
5
import net.lerariemann.infinity.registry.var.ModPoi;
6
6
+
import net.lerariemann.infinity.util.InfinityMethods;
6
7
import net.minecraft.block.BlockState;
7
8
import net.minecraft.block.NetherPortalBlock;
8
9
import net.minecraft.entity.Entity;
+3
-2
common/src/main/java/net/lerariemann/infinity/util/PortalCreator.java
common/src/main/java/net/lerariemann/infinity/util/teleport/PortalCreator.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.teleport;
2
2
3
3
import com.google.common.collect.Queues;
4
4
import com.google.common.collect.Sets;
···
11
11
import net.lerariemann.infinity.block.entity.InfinityPortalBlockEntity;
12
12
import net.lerariemann.infinity.dimensions.RandomDimension;
13
13
import net.lerariemann.infinity.registry.core.ModItems;
14
14
-
import net.lerariemann.infinity.loading.DimensionGrabber;
14
14
+
import net.lerariemann.infinity.util.InfinityMethods;
15
15
+
import net.lerariemann.infinity.util.loading.DimensionGrabber;
15
16
import net.lerariemann.infinity.options.PortalColorApplier;
16
17
import net.lerariemann.infinity.registry.var.ModCriteria;
17
18
import net.lerariemann.infinity.registry.var.ModPayloads;
+20
-20
common/src/main/java/net/lerariemann/infinity/util/RandomProvider.java
common/src/main/java/net/lerariemann/infinity/util/core/RandomProvider.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.core;
2
2
3
3
import net.lerariemann.infinity.InfinityMod;
4
4
import net.minecraft.item.Item;
···
41
41
public RandomProvider(String configpath) {
42
42
configPath = configpath;
43
43
initStorage();
44
44
-
register_all();
45
45
-
easterizer = new Easterizer(this);
44
44
+
registerAll();
45
45
+
easterizer = new Easterizer(configPath);
46
46
}
47
47
48
48
void initStorage() {
···
54
54
disabledDimensions = new ArrayList<>();
55
55
}
56
56
57
57
-
void register_all() {
58
58
-
read_root_config();
59
59
-
String path = configPath + "modular";
60
60
-
register_category(registry, path, "misc", CommonIO::stringListReader);
61
61
-
register_category(registry, path, "features", CommonIO::stringListReader);
62
62
-
register_category(registry, path, "vegetation", CommonIO::stringListReader);
63
63
-
register_category(compoundRegistry, path, "blocks", CommonIO::compoundListReader);
64
64
-
extract_blocks();
65
65
-
register_category(compoundRegistry, path, "extra", CommonIO::compoundListReader);
66
66
-
extract_mobs();
67
67
-
register_category_hardcoded(configPath + "hardcoded");
57
57
+
void registerAll() {
58
58
+
readRootConfig();
59
59
+
registerCategory(registry, "misc", CommonIO::stringListReader);
60
60
+
registerCategory(registry, "features", CommonIO::stringListReader);
61
61
+
registerCategory(registry, "vegetation", CommonIO::stringListReader);
62
62
+
registerCategory(compoundRegistry, "blocks", CommonIO::compoundListReader);
63
63
+
extractBlocks();
64
64
+
registerCategory(compoundRegistry, "extra", CommonIO::compoundListReader);
65
65
+
extractMobs();
66
66
+
registerHardcoded();
68
67
}
69
68
70
70
-
void read_root_config() {
69
69
+
void readRootConfig() {
71
70
NbtCompound rootConfig = CommonIO.read(configPath + "infinity.json");
72
71
portalKey = rootConfig.getString("portalKey");
73
72
altarKey = rootConfig.getString("altarKey");
···
148
147
return gameRules.getOrDefault(key, false);
149
148
}
150
149
151
151
-
void extract_blocks() {
150
150
+
void extractBlocks() {
152
151
if (compoundRegistry.containsKey("blocks")) {
153
152
WeighedStructure<NbtElement> blocksSettings = compoundRegistry.get("blocks");
154
153
WeighedStructure<NbtElement> allBlocks = new WeighedStructure<>();
···
180
179
}
181
180
}
182
181
183
183
-
void extract_mobs() {
182
182
+
void extractMobs() {
184
183
if (compoundRegistry.containsKey("mobs")) {
185
184
WeighedStructure<NbtElement> allmobs = compoundRegistry.get("mobs");
186
185
WeighedStructure<String> allMobNames = new WeighedStructure<>();
···
201
200
return res;
202
201
}
203
202
204
204
-
static <B> void register_category(Map<String, B> reg, String path, String subpath, ListReader<B> reader) {
203
203
+
<B> void registerCategory(Map<String, B> reg, String subpath, ListReader<B> reader) {
204
204
+
String path = configPath + "modular";
205
205
try {
206
206
walk(Paths.get(path + "/minecraft/" + subpath)).forEach(p -> {
207
207
String fullname = p.toString();
···
217
217
}
218
218
}
219
219
220
220
-
void register_category_hardcoded(String path) {
220
220
+
void registerHardcoded() {
221
221
try {
222
222
-
walk(Paths.get(path)).forEach(p -> {
222
222
+
walk(Paths.get(configPath + "hardcoded")).forEach(p -> {
223
223
String fullname = p.toString();
224
224
if (fullname.endsWith(".json")) {
225
225
String name = fullname.substring(fullname.lastIndexOf("/") + 1, fullname.length() - 5);
+3
-1
common/src/main/java/net/lerariemann/infinity/util/ShaderLoader.java
common/src/main/java/net/lerariemann/infinity/util/loading/ShaderLoader.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.loading;
2
2
3
3
import net.fabricmc.api.EnvType;
4
4
import net.fabricmc.api.Environment;
5
5
import net.lerariemann.infinity.access.GameRendererAccess;
6
6
import net.lerariemann.infinity.iridescence.Iridescence;
7
7
+
import net.lerariemann.infinity.util.InfinityMethods;
8
8
+
import net.lerariemann.infinity.util.core.CommonIO;
7
9
import net.minecraft.client.MinecraftClient;
8
10
import net.minecraft.nbt.NbtCompound;
9
11
import net.minecraft.resource.ResourcePackManager;
+2
-1
common/src/main/java/net/lerariemann/infinity/util/SurfaceRuleScanner.java
common/src/main/java/net/lerariemann/infinity/util/config/SurfaceRuleScanner.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.config;
2
2
3
3
import net.lerariemann.infinity.dimensions.RandomNoisePreset;
4
4
+
import net.lerariemann.infinity.util.core.CommonIO;
4
5
import net.minecraft.nbt.*;
5
6
import net.minecraft.registry.Registry;
6
7
import net.minecraft.registry.RegistryKeys;
+1
-1
common/src/main/java/net/lerariemann/infinity/util/TextData.java
common/src/main/java/net/lerariemann/infinity/util/var/TextData.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.var;
2
2
3
3
import net.minecraft.util.math.BlockPos;
4
4
import net.minecraft.util.math.Direction;
+2
-1
common/src/main/java/net/lerariemann/infinity/util/WarpLogic.java
common/src/main/java/net/lerariemann/infinity/util/teleport/WarpLogic.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.teleport;
2
2
3
3
import com.mojang.brigadier.context.CommandContext;
4
4
import com.mojang.brigadier.exceptions.CommandSyntaxException;
···
6
6
import net.lerariemann.infinity.access.ServerPlayerEntityAccess;
7
7
import net.lerariemann.infinity.registry.var.ModCommands;
8
8
import net.lerariemann.infinity.registry.var.ModStats;
9
9
+
import net.lerariemann.infinity.util.InfinityMethods;
9
10
import net.minecraft.block.Block;
10
11
import net.minecraft.block.BlockState;
11
12
import net.minecraft.block.Blocks;
+2
-2
common/src/main/java/net/lerariemann/infinity/util/WeighedStructure.java
common/src/main/java/net/lerariemann/infinity/util/core/WeighedStructure.java
reviewed
···
1
1
-
package net.lerariemann.infinity.util;
1
1
+
package net.lerariemann.infinity.util.core;
2
2
3
3
import java.util.ArrayList;
4
4
import java.util.List;
···
22
22
weights.add(weight);
23
23
}
24
24
25
25
-
int size() {
25
25
+
public int size() {
26
26
return keys.size();
27
27
}
28
28
+2
-1
fabric/src/main/java/net/lerariemann/infinity/util/fabric/ConfigManagerImpl.java
reviewed
···
1
1
package net.lerariemann.infinity.util.fabric;
2
2
3
3
import net.fabricmc.loader.api.FabricLoader;
4
4
+
import net.lerariemann.infinity.util.config.ConfigManager;
4
5
5
6
import java.nio.file.Path;
6
7
/**
7
7
-
* See {@link net.lerariemann.infinity.util.ConfigManager} for usages.
8
8
+
* See {@link ConfigManager} for usages.
8
9
*/
9
10
@SuppressWarnings("unused")
10
11
public class ConfigManagerImpl {
+2
-1
neoforge/src/main/java/net/lerariemann/infinity/util/neoforge/ConfigManagerImpl.java
reviewed
···
1
1
package net.lerariemann.infinity.util.neoforge;
2
2
3
3
+
import net.lerariemann.infinity.util.config.ConfigManager;
3
4
import net.neoforged.fml.loading.FMLConfig;
4
5
5
6
import java.nio.file.Path;
6
7
/**
7
7
-
* See {@link net.lerariemann.infinity.util.ConfigManager} for usages.
8
8
+
* See {@link ConfigManager} for usages.
8
9
*/
9
10
@SuppressWarnings("unused")
10
11
public class ConfigManagerImpl {