mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-22 08:19:19 +00:00
sort classes
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common;
|
||||
package com.ishland.c2me.opts.dfc.common;
|
||||
|
||||
import net.minecraft.world.level.levelgen.NoiseRouterData;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast;
|
||||
package com.ishland.c2me.opts.dfc.common.ast;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
public interface AstNode {
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast;
|
||||
package com.ishland.c2me.opts.dfc.common.ast;
|
||||
|
||||
public interface AstTransformer {
|
||||
AstNode transform(AstNode var1);
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast;
|
||||
package com.ishland.c2me.opts.dfc.common.ast;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.vif.EachApplierVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.EachApplierVanillaInterface;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import net.minecraft.world.level.levelgen.NoiseChunk;
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast;
|
||||
package com.ishland.c2me.opts.dfc.common.ast;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.binary.AddNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.binary.MaxNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.binary.MaxShortNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.binary.MinNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.binary.MinShortNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.binary.MulNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.CacheLikeNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.ConstantNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.DelegateNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.RangeChoiceNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.YClampedGradientNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.noise.DFTNoiseNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.noise.DFTShiftANode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.noise.DFTShiftBNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.noise.DFTShiftNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.noise.DFTWeirdScaledSamplerNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.noise.ShiftedNoiseNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.spline.SplineAstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.unary.AbsNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.unary.CubeNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.unary.NegMulNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.unary.SquareNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.unary.SqueezeNode;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IEqualityOverriding;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IFastCacheLike;
|
||||
import org.bxteam.divinemc.dfc.common.vif.AstVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.binary.AddNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.binary.MaxNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.binary.MaxShortNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.binary.MinNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.binary.MinShortNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.binary.MulNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.CacheLikeNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.ConstantNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.DelegateNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.RangeChoiceNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.YClampedGradientNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.noise.DFTNoiseNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.noise.DFTShiftANode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.noise.DFTShiftBNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.noise.DFTShiftNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.noise.DFTWeirdScaledSamplerNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.noise.ShiftedNoiseNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.spline.SplineAstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.unary.AbsNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.unary.CubeNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.unary.NegMulNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.unary.SquareNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.unary.SqueezeNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IEqualityOverriding;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IFastCacheLike;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.AstVanillaInterface;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import net.minecraft.world.level.levelgen.DensityFunctions;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import java.util.Objects;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.binary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.binary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.dfvisitor;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.dfvisitor;
|
||||
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import net.minecraft.world.level.levelgen.DensityFunctions;
|
||||
@@ -1,13 +1,13 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.misc;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.misc;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IFastCacheLike;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import org.bxteam.divinemc.dfc.common.gen.IMultiMethod;
|
||||
import org.bxteam.divinemc.dfc.common.gen.ISingleMethod;
|
||||
import org.bxteam.divinemc.dfc.common.gen.SubCompiledDensityFunction;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IFastCacheLike;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.IMultiMethod;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.ISingleMethod;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.SubCompiledDensityFunction;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import net.minecraft.world.level.levelgen.DensityFunctions;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.misc;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.misc;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Arrays;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,12 +1,12 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.misc;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.misc;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import org.bxteam.divinemc.dfc.common.vif.EachApplierVanillaInterface;
|
||||
import org.bxteam.divinemc.dfc.common.vif.NoisePosVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.EachApplierVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.NoisePosVanillaInterface;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.objectweb.asm.Label;
|
||||
@@ -1,10 +1,10 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.misc;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.misc;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import java.util.Objects;
|
||||
import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.Type;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.misc;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.misc;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.misc;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.misc;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import net.minecraft.util.Mth;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.noise;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.noise;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.objectweb.asm.Type;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.noise;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.noise;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.objectweb.asm.Type;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.noise;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.noise;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.objectweb.asm.Type;
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.noise;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.noise;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.objectweb.asm.Type;
|
||||
@@ -1,10 +1,10 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.noise;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.noise;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.IDensityFunctionsCaveScaler;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.IDensityFunctionsCaveScaler;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import net.minecraft.world.level.levelgen.DensityFunctions;
|
||||
@@ -1,10 +1,10 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.noise;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.noise;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen.Context;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen.Context;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.objectweb.asm.Type;
|
||||
@@ -1,11 +1,11 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.spline;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.spline;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.ast.McToAst;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import org.bxteam.divinemc.dfc.common.vif.NoisePosVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.McToAst;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.NoisePosVanillaInterface;
|
||||
import it.unimi.dsi.fastutil.Pair;
|
||||
import it.unimi.dsi.fastutil.ints.IntObjectPair;
|
||||
import java.util.ArrayList;
|
||||
@@ -16,7 +16,7 @@ import net.minecraft.util.CubicSpline;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import net.minecraft.world.level.levelgen.DensityFunctions;
|
||||
import org.bxteam.divinemc.util.Assertions;
|
||||
import com.ishland.flowsched.util.Assertions;
|
||||
import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.AnalyzerAdapter;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.spline;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.spline;
|
||||
|
||||
public class SplineSupport {
|
||||
public SplineSupport() {
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.unary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.unary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.unary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.unary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstTransformer;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstTransformer;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import java.util.Objects;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.unary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.unary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.unary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.unary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.unary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.unary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.ast.unary;
|
||||
package com.ishland.c2me.opts.dfc.common.ast.unary;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.gen.BytecodeGen;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.gen.BytecodeGen;
|
||||
import net.minecraft.util.Mth;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.commons.InstructionAdapter;
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.ishland.c2me.opts.dfc.common.ducks;
|
||||
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
|
||||
public interface IArrayCacheCapable {
|
||||
ArrayCache c2me$getArrayCache();
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.ducks;
|
||||
package com.ishland.c2me.opts.dfc.common.ducks;
|
||||
|
||||
public interface IBlendingAwareVisitor {
|
||||
boolean c2me$isBlendingEnabled();
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.ducks;
|
||||
package com.ishland.c2me.opts.dfc.common.ducks;
|
||||
|
||||
public interface ICoordinatesFilling {
|
||||
void c2me$fillCoordinates(int[] var1, int[] var2, int[] var3);
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.ducks;
|
||||
package com.ishland.c2me.opts.dfc.common.ducks;
|
||||
|
||||
public interface IEqualityOverriding {
|
||||
void c2me$overrideEquality(Object var1);
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.bxteam.divinemc.dfc.common.ducks;
|
||||
package com.ishland.c2me.opts.dfc.common.ducks;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
|
||||
public interface IFastCacheLike extends DensityFunction {
|
||||
@@ -1,14 +1,14 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import com.google.common.io.Files;
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.ast.McToAst;
|
||||
import org.bxteam.divinemc.dfc.common.ast.dfvisitor.StripBlending;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.ConstantNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.RootNode;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import org.bxteam.divinemc.dfc.common.vif.AstVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.McToAst;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.dfvisitor.StripBlending;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.ConstantNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.RootNode;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.AstVanillaInterface;
|
||||
import it.unimi.dsi.fastutil.Hash;
|
||||
import it.unimi.dsi.fastutil.Pair;
|
||||
import it.unimi.dsi.fastutil.ints.IntObjectPair;
|
||||
@@ -237,7 +237,7 @@ public class BytecodeGen {
|
||||
|
||||
static {
|
||||
try {
|
||||
org.bxteam.divinemc.util.Files.deleteRecursively(exportDir);
|
||||
com.ishland.c2me.opts.dfc.util.Files.deleteRecursively(exportDir);
|
||||
} catch (IOException var1) {
|
||||
IOException e = var1;
|
||||
e.printStackTrace();
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import com.google.common.base.Suppliers;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IBlendingAwareVisitor;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IFastCacheLike;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IBlendingAwareVisitor;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IFastCacheLike;
|
||||
import java.util.List;
|
||||
import java.util.ListIterator;
|
||||
import java.util.Objects;
|
||||
@@ -1,7 +1,7 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import java.util.List;
|
||||
|
||||
public interface CompiledEntry extends ISingleMethod, IMultiMethod {
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IBlendingAwareVisitor;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IBlendingAwareVisitor;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@@ -1,7 +1,7 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface IMultiMethod {
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface ISingleMethod {
|
||||
@@ -1,12 +1,12 @@
|
||||
package org.bxteam.divinemc.dfc.common.gen;
|
||||
package com.ishland.c2me.opts.dfc.common.gen;
|
||||
|
||||
import com.google.common.base.Suppliers;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IArrayCacheCapable;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IBlendingAwareVisitor;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.ICoordinatesFilling;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import org.bxteam.divinemc.dfc.common.vif.EachApplierVanillaInterface;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IArrayCacheCapable;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IBlendingAwareVisitor;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.ICoordinatesFilling;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.vif.EachApplierVanillaInterface;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.util.KeyDispatchDataCodec;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.dfc.common.util;
|
||||
package com.ishland.c2me.opts.dfc.common.util;
|
||||
|
||||
import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
|
||||
import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
|
||||
@@ -1,10 +1,10 @@
|
||||
package org.bxteam.divinemc.dfc.common.vif;
|
||||
package com.ishland.c2me.opts.dfc.common.vif;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.AstNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.CacheLikeNode;
|
||||
import org.bxteam.divinemc.dfc.common.ast.misc.DelegateNode;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IFastCacheLike;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.AstNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.CacheLikeNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.misc.DelegateNode;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IFastCacheLike;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.util.KeyDispatchDataCodec;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
@@ -1,8 +1,8 @@
|
||||
package org.bxteam.divinemc.dfc.common.vif;
|
||||
package com.ishland.c2me.opts.dfc.common.vif;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import org.bxteam.divinemc.dfc.common.ducks.IArrayCacheCapable;
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ducks.IArrayCacheCapable;
|
||||
import com.ishland.c2me.opts.dfc.common.util.ArrayCache;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.bxteam.divinemc.dfc.common.vif;
|
||||
package com.ishland.c2me.opts.dfc.common.vif;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.ast.EvalType;
|
||||
import com.ishland.c2me.opts.dfc.common.ast.EvalType;
|
||||
import java.util.Objects;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.util;
|
||||
package com.ishland.c2me.opts.dfc.util;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.util;
|
||||
package com.ishland.c2me.opts.worldgen.general.common.random_instances;
|
||||
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.util.RandomSource;
|
||||
@@ -7,27 +7,18 @@ import net.minecraft.world.level.levelgen.PositionalRandomFactory;
|
||||
import net.minecraft.world.level.levelgen.SingleThreadedRandomSource;
|
||||
import net.minecraft.world.level.levelgen.Xoroshiro128PlusPlus;
|
||||
import net.minecraft.world.level.levelgen.XoroshiroRandomSource;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public final class RandomUtil {
|
||||
public static @NotNull RandomSource getRandom(PositionalRandomFactory deriver) {
|
||||
if (deriver instanceof XoroshiroRandomSource.XoroshiroPositionalRandomFactory) {
|
||||
return new XoroshiroRandomSource(0L, 0L);
|
||||
}
|
||||
if (deriver instanceof LegacyRandomSource.LegacyPositionalRandomFactory) {
|
||||
return new SingleThreadedRandomSource(0L);
|
||||
}
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
public class RandomUtils {
|
||||
private static final ThreadLocal<XoroshiroRandomSource> xoroshiro = ThreadLocal.withInitial(() -> new XoroshiroRandomSource(0L, 0L));
|
||||
private static final ThreadLocal<SingleThreadedRandomSource> simple = ThreadLocal.withInitial(() -> new SingleThreadedRandomSource(0L));
|
||||
|
||||
public static void derive(PositionalRandomFactory deriver, RandomSource random, int x, int y, int z) {
|
||||
if (deriver instanceof final XoroshiroRandomSource.XoroshiroPositionalRandomFactory deriver1) {
|
||||
if (deriver instanceof XoroshiroRandomSource.XoroshiroPositionalRandomFactory(long seedLo, long seedHi)) {
|
||||
final Xoroshiro128PlusPlus implementation = ((XoroshiroRandomSource) random).randomNumberGenerator;
|
||||
implementation.seedLo = (Mth.getSeed(x, y, z) ^ deriver1.seedLo());
|
||||
implementation.seedHi = (deriver1.seedHi());
|
||||
implementation.seedLo = (Mth.getSeed(x, y, z) ^ seedLo);
|
||||
implementation.seedHi = (seedHi);
|
||||
return;
|
||||
}
|
||||
if (deriver instanceof LegacyRandomSource.LegacyPositionalRandomFactory(long seed)) {
|
||||
@@ -37,4 +28,15 @@ public final class RandomUtil {
|
||||
}
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
@Contract("null -> fail")
|
||||
public static @NotNull RandomSource getRandom(PositionalRandomFactory deriver) {
|
||||
if (deriver instanceof XoroshiroRandomSource.XoroshiroPositionalRandomFactory) {
|
||||
return new XoroshiroRandomSource(0L, 0L);
|
||||
}
|
||||
if (deriver instanceof LegacyRandomSource.LegacyPositionalRandomFactory) {
|
||||
return new SingleThreadedRandomSource(0L);
|
||||
}
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.util;
|
||||
package com.ishland.flowsched.util;
|
||||
|
||||
public final class Assertions {
|
||||
public static void assertTrue(boolean value, String message) {
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.util;
|
||||
package gg.pufferfish.pufferfish.util;
|
||||
|
||||
import it.unimi.dsi.fastutil.PriorityQueue;
|
||||
import it.unimi.dsi.fastutil.PriorityQueues;
|
||||
@@ -10,14 +10,14 @@ import org.bxteam.divinemc.spark.ThreadDumperRegistry;
|
||||
import java.util.NoSuchElementException;
|
||||
import java.util.concurrent.locks.LockSupport;
|
||||
|
||||
public class AsyncProcessor implements Runnable {
|
||||
private static final Logger LOGGER = LogManager.getLogger(AsyncProcessor.class);
|
||||
public class AsyncExecutor implements Runnable {
|
||||
private static final Logger LOGGER = LogManager.getLogger(AsyncExecutor.class);
|
||||
|
||||
public final Thread thread;
|
||||
private final PriorityQueue<Runnable> jobs = PriorityQueues.synchronize(new ObjectArrayFIFOQueue<>());
|
||||
private volatile boolean killswitch = false;
|
||||
|
||||
public AsyncProcessor(String threadName) {
|
||||
public AsyncExecutor(String threadName) {
|
||||
this.thread = Thread.ofPlatform()
|
||||
.name(threadName)
|
||||
.priority(Thread.NORM_PRIORITY - 1)
|
||||
@@ -4,7 +4,6 @@ import io.papermc.paper.ServerBuildInfo;
|
||||
import joptsimple.OptionParser;
|
||||
import joptsimple.OptionSet;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.server.Eula;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.craftbukkit.Main;
|
||||
import org.slf4j.Logger;
|
||||
@@ -13,11 +12,8 @@ import org.slf4j.LoggerFactory;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.List;
|
||||
|
||||
@SuppressWarnings("DuplicatedCode")
|
||||
public class DivineBootstrap {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger("DivineBootstrap");
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.server.network;
|
||||
package org.bxteam.divinemc.async;
|
||||
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
@@ -19,14 +19,9 @@ public class AsyncJoinHandler {
|
||||
public static ExecutorService JOIN_EXECUTOR;
|
||||
|
||||
private static boolean enabled = false;
|
||||
private static int threadCount = 2;
|
||||
|
||||
/**
|
||||
* Initialize the AsyncJoinHandler with configuration settings
|
||||
*/
|
||||
public static void init(boolean enabled, int threadCount) {
|
||||
AsyncJoinHandler.enabled = enabled;
|
||||
AsyncJoinHandler.threadCount = Math.max(1, threadCount);
|
||||
|
||||
if (enabled) {
|
||||
if (JOIN_EXECUTOR != null) {
|
||||
@@ -50,13 +45,6 @@ public class AsyncJoinHandler {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute a potentially blocking task asynchronously
|
||||
*
|
||||
* @param task The task to run asynchronously
|
||||
* @param callback The callback to execute on the main thread when the task completes
|
||||
* @param <T> The return type of the task
|
||||
*/
|
||||
public static <T> void runAsync(Supplier<T> task, java.util.function.Consumer<T> callback) {
|
||||
if (!enabled || JOIN_EXECUTOR == null) {
|
||||
T result = task.get();
|
||||
@@ -74,11 +62,6 @@ public class AsyncJoinHandler {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute a potentially blocking task asynchronously without a result
|
||||
*
|
||||
* @param asyncTask The task to run asynchronously
|
||||
*/
|
||||
public static void runAsync(Runnable asyncTask) {
|
||||
if (!enabled || JOIN_EXECUTOR == null) {
|
||||
asyncTask.run();
|
||||
@@ -93,9 +76,6 @@ public class AsyncJoinHandler {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the executor service for async join operations
|
||||
*/
|
||||
public static Executor getExecutor() {
|
||||
return enabled && JOIN_EXECUTOR != null ? JOIN_EXECUTOR : Runnable::run;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import ca.spottedleaf.moonrise.common.util.TickThread;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import net.minecraft.world.level.pathfinder.NodeEvaluator;
|
||||
import org.apache.commons.lang3.Validate;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import net.minecraft.world.level.pathfinder.NodeEvaluator;
|
||||
import net.minecraft.world.level.pathfinder.SwimNodeEvaluator;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import net.minecraft.world.level.pathfinder.NodeEvaluator;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import net.minecraft.world.level.pathfinder.*;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
public enum PathProcessState {
|
||||
WAITING,
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.pathfinding;
|
||||
package org.bxteam.divinemc.async.pathfinding;
|
||||
|
||||
import org.bxteam.divinemc.config.DivineConfig;
|
||||
import java.util.Locale;
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.bxteam.divinemc.entity.tracking;
|
||||
package org.bxteam.divinemc.async.tracking;
|
||||
|
||||
import ca.spottedleaf.moonrise.common.list.ReferenceList;
|
||||
import ca.spottedleaf.moonrise.common.misc.NearbyPlayers;
|
||||
@@ -1,13 +1,14 @@
|
||||
package org.bxteam.divinemc.server;
|
||||
package org.bxteam.divinemc.async.world;
|
||||
|
||||
import ca.spottedleaf.moonrise.common.util.TickThread;
|
||||
import org.bxteam.divinemc.spark.ThreadDumperRegistry;
|
||||
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
|
||||
public class ServerLevelTickExecutorThreadFactory implements ThreadFactory {
|
||||
public class ServerLevelTickThreadFactory implements ThreadFactory {
|
||||
private final String worldName;
|
||||
|
||||
public ServerLevelTickExecutorThreadFactory(String worldName) {
|
||||
public ServerLevelTickThreadFactory(String worldName) {
|
||||
this.worldName = worldName;
|
||||
ThreadDumperRegistry.REGISTRY.add(worldName + " - ServerLevel Tick Worker");
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package org.bxteam.divinemc.async.world;
|
||||
|
||||
public enum TeleportState {
|
||||
INACTIVE,
|
||||
PENDING,
|
||||
CANCELLED
|
||||
}
|
||||
@@ -10,10 +10,10 @@ import org.apache.logging.log4j.Logger;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.configuration.MemoryConfiguration;
|
||||
import org.bxteam.divinemc.config.annotations.Experimental;
|
||||
import org.bxteam.divinemc.entity.pathfinding.PathfindTaskRejectPolicy;
|
||||
import org.bxteam.divinemc.async.pathfinding.PathfindTaskRejectPolicy;
|
||||
import org.bxteam.divinemc.region.EnumRegionFileExtension;
|
||||
import org.bxteam.divinemc.region.type.LinearRegionFile;
|
||||
import org.bxteam.divinemc.server.network.AsyncJoinHandler;
|
||||
import org.bxteam.divinemc.async.AsyncJoinHandler;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.simpleyaml.configuration.comments.CommentType;
|
||||
import org.simpleyaml.configuration.file.YamlFile;
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package org.bxteam.divinemc.dfc.common.ducks;
|
||||
|
||||
import org.bxteam.divinemc.dfc.common.util.ArrayCache;
|
||||
|
||||
public interface IArrayCacheCapable {
|
||||
ArrayCache c2me$getArrayCache();
|
||||
}
|
||||
@@ -3,9 +3,9 @@ package org.bxteam.divinemc.util;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.bxteam.divinemc.entity.pathfinding.AsyncPathProcessor;
|
||||
import org.bxteam.divinemc.entity.tracking.MultithreadedTracker;
|
||||
import org.bxteam.divinemc.server.network.AsyncJoinHandler;
|
||||
import org.bxteam.divinemc.async.pathfinding.AsyncPathProcessor;
|
||||
import org.bxteam.divinemc.async.tracking.MultithreadedTracker;
|
||||
import org.bxteam.divinemc.async.AsyncJoinHandler;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@SuppressWarnings("ConstantValue")
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package org.bxteam.divinemc.util;
|
||||
|
||||
public enum PWTTeleportState {
|
||||
INACTIVE,
|
||||
PENDING,
|
||||
CANCELLED
|
||||
}
|
||||
Reference in New Issue
Block a user