This commit is contained in:
parent
d18f393359
commit
ca15223965
@ -3,8 +3,8 @@ org.gradle.jvmargs = -Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
minecraft_version = 20w30a
|
minecraft_version = 1.16.2-pre1
|
||||||
yarn_build = 8
|
yarn_build = 1
|
||||||
fabric_loader_version = 0.9.0+build.204
|
fabric_loader_version = 0.9.0+build.204
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
@ -13,9 +13,9 @@ org.gradle.jvmargs = -Xmx1G
|
|||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||||
fabric_api_version = 0.16.0+build.386-1.16
|
fabric_api_version = 0.16.1+build.387-1.16
|
||||||
modmenu_version = 1.14.5+build.30
|
modmenu_version = 1.14.5+build.30
|
||||||
cloth_config_version = 4.6.0
|
cloth_config_version = 4.7.0-unstable
|
||||||
autoconfig_version = 3.2.0-unstable
|
autoconfig_version = 3.2.0-unstable
|
||||||
libstructure_version = 1.4.1
|
libstructure_version = 1.4.1
|
||||||
roughlyenoughitems_version = 4.10.3
|
roughlyenoughitems_version = 5.0.0-unstable
|
||||||
|
@ -24,7 +24,7 @@ import net.minecraft.util.math.BlockPos;
|
|||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.biome.Biome;
|
import net.minecraft.world.biome.GenerationSettings;
|
||||||
import net.minecraft.world.gen.GenerationStep;
|
import net.minecraft.world.gen.GenerationStep;
|
||||||
import net.minecraft.world.gen.chunk.StructureConfig;
|
import net.minecraft.world.gen.chunk.StructureConfig;
|
||||||
import net.minecraft.world.gen.feature.DefaultFeatureConfig;
|
import net.minecraft.world.gen.feature.DefaultFeatureConfig;
|
||||||
@ -120,9 +120,9 @@ public class StructureGeneratorBlock extends SimpleBlockWithEntity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addToBiome(Biome biome) {
|
public static void addToBiome(GenerationSettings.class_5495 arg) {
|
||||||
for (Map.Entry<String, StructureGeneratorBlock> entry : blocks.entrySet()) {
|
for (Map.Entry<String, StructureGeneratorBlock> entry : blocks.entrySet()) {
|
||||||
biome.addStructureFeature(entry.getValue().feature.configure(DefaultFeatureConfig.INSTANCE));
|
arg.method_30995(entry.getValue().feature.configure(DefaultFeatureConfig.INSTANCE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@ import net.minecraft.util.math.BlockBox;
|
|||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.ChunkPos;
|
import net.minecraft.util.math.ChunkPos;
|
||||||
import net.minecraft.world.ServerWorldAccess;
|
import net.minecraft.world.ServerWorldAccess;
|
||||||
|
import net.minecraft.world.StructureWorldAccess;
|
||||||
import net.minecraft.world.gen.StructureAccessor;
|
import net.minecraft.world.gen.StructureAccessor;
|
||||||
import net.minecraft.world.gen.chunk.ChunkGenerator;
|
import net.minecraft.world.gen.chunk.ChunkGenerator;
|
||||||
|
|
||||||
@ -41,7 +42,7 @@ class StructureGeneratorPiece extends StructurePiece {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean generate(ServerWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox boundingBox, ChunkPos chunkPos, BlockPos blockPos) {
|
public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox boundingBox, ChunkPos chunkPos, BlockPos blockPos) {
|
||||||
BlockState state = block.getDefaultState().rotate(rotation);
|
BlockState state = block.getDefaultState().rotate(rotation);
|
||||||
|
|
||||||
world.setBlockState(pos, state, 3);
|
world.setBlockState(pos, state, 3);
|
||||||
@ -50,7 +51,7 @@ class StructureGeneratorPiece extends StructurePiece {
|
|||||||
((StructureGeneratorBlockEntity) entity).setSeed(random.nextLong());
|
((StructureGeneratorBlockEntity) entity).setSeed(random.nextLong());
|
||||||
}
|
}
|
||||||
|
|
||||||
block.schedule(world.getWorld(), pos);
|
block.schedule(world.toServerWorld(), pos);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ public class DefensiveLaserBlockEntityRenderer extends HighlightBlockEntityRende
|
|||||||
|
|
||||||
matrices.pop();
|
matrices.pop();
|
||||||
|
|
||||||
if (client.getEntityRenderManager().shouldRenderHitboxes()) {
|
if (client.getEntityRenderDispatcher().shouldRenderHitboxes()) {
|
||||||
matrices.push();
|
matrices.push();
|
||||||
|
|
||||||
Matrix4f matrix4f = matrices.peek().getModel();
|
Matrix4f matrix4f = matrices.peek().getModel();
|
||||||
|
@ -3,6 +3,7 @@ package com.thebrokenrail.energonrelics.mixin;
|
|||||||
import com.thebrokenrail.energonrelics.EnergonRelics;
|
import com.thebrokenrail.energonrelics.EnergonRelics;
|
||||||
import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock;
|
import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock;
|
||||||
import net.minecraft.world.biome.Biome;
|
import net.minecraft.world.biome.Biome;
|
||||||
|
import net.minecraft.world.biome.GenerationSettings;
|
||||||
import net.minecraft.world.gen.GenerationStep;
|
import net.minecraft.world.gen.GenerationStep;
|
||||||
import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
|
import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
@ -13,12 +14,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(DefaultBiomeFeatures.class)
|
@Mixin(DefaultBiomeFeatures.class)
|
||||||
public class MixinDefaultBiomeFeatures {
|
public class MixinDefaultBiomeFeatures {
|
||||||
@Inject(at = @At("RETURN"), method = "addDefaultOres")
|
@Inject(at = @At("RETURN"), method = "addDefaultOres")
|
||||||
private static void addDefaultOres(Biome biome, CallbackInfo info) {
|
private static void addDefaultOres(GenerationSettings.class_5495 arg, CallbackInfo info) {
|
||||||
biome.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, EnergonRelics.VERIDIUM_ORE_FEATURE);
|
arg.method_30992(GenerationStep.Feature.UNDERGROUND_ORES, EnergonRelics.VERIDIUM_ORE_FEATURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(at = @At("RETURN"), method = "addDefaultUndergroundStructures")
|
@Inject(at = @At("RETURN"), method = "addDefaultUndergroundStructures")
|
||||||
private static void addDefaultUndergroundStructures(Biome biome, CallbackInfo info) {
|
private static void addDefaultUndergroundStructures(GenerationSettings.class_5495 arg, CallbackInfo info) {
|
||||||
StructureGeneratorBlock.addToBiome(biome);
|
StructureGeneratorBlock.addToBiome(arg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user