7 Commits

Author SHA1 Message Date
Motschen
b1b8962ec0 Add back MidnightHats, bump version 2020-11-24 19:13:20 +01:00
Motschen
9033b20e2b Merge pull request #6 from CoolMineman/main
Make Code More Normal
2020-11-24 18:53:34 +01:00
CoolMineman
8b39488508 make modelparts static 2020-11-21 18:50:15 -06:00
CoolMineman
e9b4db47d8 clean up terrible code 2020-11-21 18:38:39 -06:00
CoolMineman
de5a4287c4 code cleanup 2020-11-21 18:35:44 -06:00
CoolMineman
b1864bf616 get gradle to work; remove nonexistant mod 2020-11-21 18:33:52 -06:00
Motschen
9c4c40ceb4 Probably Fixed #4, Also little code cleanup 2020-11-19 08:36:37 +01:00
17 changed files with 68 additions and 78 deletions

1
.gitignore vendored
View File

@@ -1,7 +1,6 @@
# gradle
.gradle/
build/
out/
classes/

Binary file not shown.

View File

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx2G
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.16.2
yarn_mappings=1.16.2+build.6
loader_version=0.9.1+build.205
minecraft_version=1.16.4
yarn_mappings=1.16.4+build.7
loader_version=0.10.8
# Mod Properties
mod_version = 1.2.0
mod_version = 1.2.2
maven_group = eu.midnightdust.motschen
archives_base_name = rocks

View File

View File

@@ -7,6 +7,10 @@ import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
import eu.midnightdust.motschen.rocks.world.*;
import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures;
import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures;
import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures;
import eu.midnightdust.motschen.rocks.world.configured_feature.StickFeatures;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
import net.minecraft.block.Block;
@@ -118,10 +122,11 @@ public class RocksMain implements ModInitializer {
Registry.register(Registry.ITEM, new Identifier(MOD_ID,"netherrack_splitter"), NetherrackSplitter);
Registry.register(Registry.ITEM, new Identifier(MOD_ID,"soul_soil_splitter"), SoulSoilSplitter);
new FeatureRegistry();
RockFeatures.init();
StickFeatures.init();
MiscFeatures.init();
NetherFeatures.init();
FeatureInjector.init();
BlockEntityInit.init();
}

View File

@@ -1,6 +1,5 @@
package eu.midnightdust.motschen.rocks.block.blockentity;
import eu.midnightdust.motschen.rocks.RocksMain;
import eu.midnightdust.motschen.rocks.block.NetherGeyser;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
@@ -25,7 +24,7 @@ public class NetherGeyserBlockEntity extends BlockEntity implements Tickable {
BlockState state = this.world.getBlockState(pos);
if (player != null) {
world.setBlockState(pos, RocksMain.NetherGeyser.getDefaultState().with(NetherGeyser.ACTIVE, true));
world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, true));
player.damage(DamageSource.ON_FIRE,1);
if (player2 != null) {
player2.damage(DamageSource.ON_FIRE,4);
@@ -37,11 +36,11 @@ public class NetherGeyserBlockEntity extends BlockEntity implements Tickable {
countdown = countdown - 1;
}
if (countdown == 0) {
world.setBlockState(pos, RocksMain.NetherGeyser.getDefaultState().with(NetherGeyser.ACTIVE, false));
world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, false));
}
}
if (world != null && state.get(NetherGeyser.ACTIVE) == true) {
if (Boolean.TRUE.equals(state.get(NetherGeyser.ACTIVE))) {
world.addParticle(ParticleTypes.LAVA,pos.getX()+0.5,pos.getY()+0.1,pos.getZ()+0.5,1,1.5,1);
world.addParticle(ParticleTypes.LAVA,pos.getX()+0.5,pos.getY()+1.0,pos.getZ()+0.5,1,1.5,1);
world.addParticle(ParticleTypes.SMOKE,pos.getX()+0.5,pos.getY()+0.1,pos.getZ()+0.5,0,0.3,0);

View File

@@ -12,7 +12,6 @@ import net.minecraft.util.math.BlockPos;
public class OverworldGeyserBlockEntity extends BlockEntity implements Tickable {
private int countdown = 0;
private int pushUp = 0;
public OverworldGeyserBlockEntity() {
super(BlockEntityInit.OVERWORLD_GEYSER_BE);
@@ -33,7 +32,7 @@ public class OverworldGeyserBlockEntity extends BlockEntity implements Tickable
if (player != null) {
world.setBlockState(pos, state.with(OverworldGeyser.ACTIVE, true));
if (player3 != null) {
player.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 2, 12, true, false, false));
player3.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 2, 12, true, false, false));
}
countdown = 1000;
}

View File

@@ -2,38 +2,16 @@ package eu.midnightdust.motschen.rocks.block.blockentity;
import eu.midnightdust.motschen.rocks.RocksMain;
import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.Tickable;
import net.minecraft.util.math.BlockPos;
public class StarfishBlockEntity extends BlockEntity implements Tickable {
private String variation;
public class StarfishBlockEntity extends BlockEntity {
public StarfishBlockEntity() {
super(BlockEntityInit.STARFISH_BE);
}
@Override
public void tick() {
BlockPos pos = this.pos;
BlockState state = this.world.getBlockState(pos);
if (world != null && state.get(RocksMain.STARFISH_VARIATION) == StarfishVariation.RED) {
variation = String.valueOf(StarfishVariation.RED);
return;
}
else if (world != null && state.get(RocksMain.STARFISH_VARIATION) == StarfishVariation.PINK) {
variation = String.valueOf(StarfishVariation.PINK);
return;
}
else {
variation = String.valueOf(StarfishVariation.ORANGE);
return;
}
}
public String getVariation() {
return variation;
public StarfishVariation getVariation() {
return this.world.getBlockState(pos).get(RocksMain.STARFISH_VARIATION);
}
}

View File

@@ -16,15 +16,14 @@ import net.minecraft.util.Identifier;
@Environment(EnvType.CLIENT)
public class StarfishBlockEntityRenderer extends BlockEntityRenderer<StarfishBlockEntity> {
private final ModelPart side1;
private final ModelPart side2;
private final ModelPart side3;
private final ModelPart side4;
private final ModelPart side5;
private final ModelPart bb_main;
private static final ModelPart side1;
private static final ModelPart side2;
private static final ModelPart side3;
private static final ModelPart side4;
private static final ModelPart side5;
private static final ModelPart bb_main;
public StarfishBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
super(blockEntityRenderDispatcher);
static {
side1 = new ModelPart(16, 16, 0, 0);
side1.setPivot(0.0F, 24.0F, 0.0F);
side1.setTextureOffset(0, 0).addCuboid(-0.5F, -1.0F, 1.0F, 1.0F, 1.0F, 4.0F, 0.0F, false);
@@ -70,9 +69,13 @@ public class StarfishBlockEntityRenderer extends BlockEntityRenderer<StarfishBlo
bb_main.setTextureOffset(1, 2).addCuboid(-0.8F, -1.0F, -1.25F, 2.0F, 1.0F, 2.0F, 0.0F, false);
bb_main.setTextureOffset(2, 2).addCuboid(-1.2F, -1.0F, -1.25F, 1.0F, 1.0F, 2.0F, 0.0F, false);
}
public StarfishBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
super(blockEntityRenderDispatcher);
}
@Override
public void render(StarfishBlockEntity blockEntity, float tickDelta, MatrixStack matrixStack, VertexConsumerProvider vertexConsumers, int light, int overlay) {
if (blockEntity.getVariation() == String.valueOf(StarfishVariation.RED)) {
if (blockEntity.getVariation().equals(StarfishVariation.RED)) {
matrixStack.push();
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("rocks:textures/block/starfish_red.png")));
@@ -85,7 +88,7 @@ public class StarfishBlockEntityRenderer extends BlockEntityRenderer<StarfishBlo
bb_main.render(matrixStack, vertexConsumer, light, overlay);
matrixStack.pop();
}
else if (blockEntity.getVariation() == String.valueOf(StarfishVariation.PINK)) {
else if (blockEntity.getVariation().equals(StarfishVariation.PINK)) {
matrixStack.push();
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("rocks:textures/block/starfish_pink.png")));
@@ -114,7 +117,7 @@ public class StarfishBlockEntityRenderer extends BlockEntityRenderer<StarfishBlo
matrixStack.pop();
}
}
public void setRotationAngle(ModelPart bone, float x, float y, float z) {
public static void setRotationAngle(ModelPart bone, float x, float y, float z) {
bone.pitch = x;
bone.yaw = y;
bone.roll = z;

View File

@@ -2,6 +2,10 @@ package eu.midnightdust.motschen.rocks.world;
import com.google.common.collect.Lists;
import eu.midnightdust.motschen.rocks.mixin.GenerationSettingsAccessorMixin;
import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures;
import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures;
import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures;
import eu.midnightdust.motschen.rocks.world.configured_feature.StickFeatures;
import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.world.biome.Biome;
@@ -22,68 +26,68 @@ public class FeatureInjector {
private static void addRockToBiome(Biome biome) {
// Rocks
if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND && biome.getCategory() != Biome.Category.BEACH && biome.getCategory() != Biome.Category.DESERT && biome.getCategory() != Biome.Category.MESA && biome.getCategory() != Biome.Category.ICY && biome.getCategory() != Biome.Category.OCEAN) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ROCK_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRANITE_ROCK_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.DIORITE_ROCK_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ANDESITE_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRANITE_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.DIORITE_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ANDESITE_ROCK_FEATURE);
}
if (biome.getCategory() == Biome.Category.BEACH || biome.getCategory() == Biome.Category.DESERT || biome.getCategory() == Biome.Category.MESA || biome.toString().contains("terrestria:lush_desert")) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.SAND_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.SAND_ROCK_FEATURE);
}
if (biome.getCategory() == Biome.Category.MESA || biome.getCategory() == Biome.Category.DESERT || biome.toString().contains("terrestria:lush_desert")) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.RED_SAND_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.RED_SAND_ROCK_FEATURE);
}
if (biome.getCategory() == Biome.Category.THEEND) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.END_STONE_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.END_STONE_ROCK_FEATURE);
}
// Sticks
if (biome.toString().contains("minecraft:forest") || biome.toString().contains("minecraft:wooded_hills") ||
biome.toString().contains("minecraft:wooded_mountains") || biome.toString().contains("minecraft:plains") ||
biome.toString().contains("minecraft:flower_forest") || biome.toString().contains("minecraft:wooded_badlands_plateau") ||
biome.toString().contains("minecraft:modified_wooded_badlands_plateau") || biome.getCategory() == Biome.Category.SWAMP) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.OAK_STICK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.OAK_STICK_FEATURE);
}
if (biome.toString().contains("minecraft:forest") || biome.toString().contains("minecraft:birch_forest") ||
biome.toString().contains("minecraft:birch_forest_hills") || biome.toString().contains("minecraft:flower_forest")) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.BIRCH_STICK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.BIRCH_STICK_FEATURE);
}
if (biome.toString().contains("minecraft:wooded_mountains") || biome.getCategory() == Biome.Category.TAIGA) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.SPRUCE_STICK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.SPRUCE_STICK_FEATURE);
}
if (biome.getCategory() == Biome.Category.SAVANNA) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.ACACIA_STICK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.ACACIA_STICK_FEATURE);
}
if (biome.getCategory() == Biome.Category.JUNGLE) {
addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, StickFeatures.JUNGLE_STICK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, StickFeatures.JUNGLE_STICK_FEATURE);
}
if (biome.toString().contains("minecraft:dark_forest") || biome.toString().contains("minecraft:dark_forest_hills") ||
biome.toString().contains("minecraft:dark_forest_mountains")) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.DARK_OAK_STICK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.DARK_OAK_STICK_FEATURE);
}
// Misc
if (biome.getCategory() == Biome.Category.BEACH && !biome.toString().contains("minecraft:snowy_beach")) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SEASHELL_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.STARFISH_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SEASHELL_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.STARFISH_FEATURE);
}
if (biome.getCategory() == Biome.Category.OCEAN) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_STARFISH_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_SEASHELL_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_STARFISH_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_SEASHELL_FEATURE);
}
if (biome.getCategory() == Biome.Category.NETHER) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHERRACK_ROCK_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.SOUL_SOIL_ROCK_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GRAVEL_ROCK_FEATURE);
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GEYSER_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHERRACK_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.SOUL_SOIL_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GRAVEL_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GEYSER_FEATURE);
}
if (biome.getCategory() != Biome.Category.NETHER) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRAVEL_ROCK_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRAVEL_ROCK_FEATURE);
}
if (biome.getCategory() == Biome.Category.ICY) {
addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SNOWY_GEYSER_FEATURE);
addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SNOWY_GEYSER_FEATURE);
}
}
public static void addFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
public static void addRockFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
GenerationSettingsAccessorMixin generationSettingsAccessor = (GenerationSettingsAccessorMixin) biome.getGenerationSettings();
int stepIndex = step.ordinal();
List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures());

View File

@@ -3,6 +3,8 @@ package eu.midnightdust.motschen.rocks.world;
import eu.midnightdust.motschen.rocks.RocksMain;
import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
import eu.midnightdust.motschen.rocks.world.feature.SnowFeature;
import eu.midnightdust.motschen.rocks.world.feature.UnderwaterFeature;
import net.minecraft.state.property.Properties;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.gen.ProbabilityConfig;

View File

@@ -1,9 +1,10 @@
package eu.midnightdust.motschen.rocks.world;
package eu.midnightdust.motschen.rocks.world.configured_feature;
import com.google.common.collect.ImmutableSet;
import eu.midnightdust.motschen.rocks.RocksMain;
import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
import eu.midnightdust.motschen.rocks.world.FeatureRegistry;
import net.minecraft.block.Blocks;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries;

View File

@@ -1,4 +1,4 @@
package eu.midnightdust.motschen.rocks.world;
package eu.midnightdust.motschen.rocks.world.configured_feature;
import com.google.common.collect.ImmutableSet;
import eu.midnightdust.motschen.rocks.RocksMain;

View File

@@ -1,4 +1,4 @@
package eu.midnightdust.motschen.rocks.world;
package eu.midnightdust.motschen.rocks.world.configured_feature;
import com.google.common.collect.ImmutableSet;
import eu.midnightdust.motschen.rocks.RocksMain;

View File

@@ -1,4 +1,4 @@
package eu.midnightdust.motschen.rocks.world;
package eu.midnightdust.motschen.rocks.world.configured_feature;
import com.google.common.collect.ImmutableSet;
import eu.midnightdust.motschen.rocks.RocksMain;

View File

@@ -1,4 +1,4 @@
package eu.midnightdust.motschen.rocks.world;
package eu.midnightdust.motschen.rocks.world.feature;
import com.mojang.serialization.Codec;
import net.minecraft.block.BlockState;

View File

@@ -1,4 +1,4 @@
package eu.midnightdust.motschen.rocks.world;
package eu.midnightdust.motschen.rocks.world.feature;
import com.mojang.serialization.Codec;
import net.minecraft.block.BlockState;