Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
bugs and texture changes
  • Loading branch information
LudoCrypt committed Jul 27, 2020
1 parent 9ea7cef commit a7076eb
Show file tree
Hide file tree
Showing 89 changed files with 127 additions and 79 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/backrooms.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"level0": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0"
"dimension": "backrooms:level_0"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/level_0.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level0": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0"
"dimension": "backrooms:level_0"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/level_0_dotted.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level0dotted": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0dotted"
"dimension": "backrooms:level_0_dotted"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/level_0_red.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level0red": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0red"
"dimension": "backrooms:level_0_red"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/level_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level1": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level1"
"dimension": "backrooms:level_1"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/level_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level2": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level2"
"dimension": "backrooms:level_2"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/level_3.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level3": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level3"
"dimension": "backrooms:level_3"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bin/main/data/backrooms/advancements/root_backrooms.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"level0": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0"
"dimension": "backrooms:level_0"
}
}
},
Expand Down
12 changes: 6 additions & 6 deletions bin/main/data/backrooms/advancements/timewaster.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"level0": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0",
"dimension": "backrooms:level_0",
"position": {
"y": 255
}
Expand All @@ -27,7 +27,7 @@
"level1": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level1",
"dimension": "backrooms:level_1",
"position": {
"y": 255
}
Expand All @@ -36,7 +36,7 @@
"level2": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level2",
"dimension": "backrooms:level_2",
"position": {
"y": 255
}
Expand All @@ -45,7 +45,7 @@
"level3": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level3",
"dimension": "backrooms:level_3",
"position": {
"y": 255
}
Expand All @@ -54,7 +54,7 @@
"level0dotted": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0dotted",
"dimension": "backrooms:level_0_dotted",
"position": {
"y": 255
}
Expand All @@ -63,7 +63,7 @@
"level0red": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "backrooms:level0red",
"dimension": "backrooms:level_0_red",
"position": {
"y": 255
}
Expand Down
15 changes: 15 additions & 0 deletions bin/main/data/backrooms/loot_tables/chests/level3.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,21 @@
"name": "minecraft:golden_sword",
"weight": 3
},
{
"type": "item",
"name": "minecraft:iron_pickaxe",
"weight": 2
},
{
"type": "item",
"name": "minecraft:gold_pickaxe",
"weight": 3
},
{
"type": "item",
"name": "backrooms:music_disc_pretzels_and_cheese",
"weight": 3
},
{
"type": "item",
"name": "minecraft:golden_apple",
Expand Down
2 changes: 1 addition & 1 deletion bin/main/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "backrooms",
"version": "1.0.1",
"version": "1.1.0",

"name": "The Backrooms",
"description": "The backrooms, endless mono yellow rooms to traverse.",
Expand Down
Binary file modified bin/main/net/ludocrypt/backrooms/biome/Level0.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/biome/Level0Red.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/biome/Level1.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/biome/Level2.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/biome/Level3.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Carpet.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Tile.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/TornWallpaper.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Wallpaper.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/dimension/BackroomsPlacers.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.class
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ yarn_mappings=1.16.1+build.21
loader_version=0.9.0+build.204

# Mod Properties
mod_version = 1.1.0
mod_version = 1.1.1
maven_group = net.ludocrypt
archives_base_name = the-backrooms

Expand Down
23 changes: 3 additions & 20 deletions src/main/java/net/ludocrypt/backrooms/biome/Level0.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,9 @@ public Level0() {
LevelsFeatureInit.LEVEL0ROOM.configure(FeatureConfig.DEFAULT)
.createDecoratedFeature(LEVEL0PLACER.configure(DecoratorConfig.DEFAULT)));

this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2));
this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 5, 0, 2));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2));

}

@Override
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/ludocrypt/backrooms/biome/Level0Red.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import net.ludocrypt.backrooms.features.LevelsFeatureInit;
import net.ludocrypt.backrooms.features.decorators.Level0RedRoomDecorator;
import net.minecraft.block.BlockState;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.gen.GenerationStep;
Expand All @@ -32,6 +34,10 @@ public Level0Red() {
this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS,
LevelsFeatureInit.LEVEL0REDROOM.configure(FeatureConfig.DEFAULT)
.createDecoratedFeature(LEVEL0REDPLACER.configure(DecoratorConfig.DEFAULT)));

this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 4, 0, 2));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2));

}

@Override
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/ludocrypt/backrooms/biome/Level1.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import net.ludocrypt.backrooms.features.LevelsFeatureInit;
import net.ludocrypt.backrooms.features.decorators.Level1RoomDecorator;
import net.minecraft.block.BlockState;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.gen.GenerationStep;
Expand All @@ -32,6 +34,10 @@ public Level1() {
this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS,
LevelsFeatureInit.LEVEL1ROOM.configure(FeatureConfig.DEFAULT)
.createDecoratedFeature(LEVEL1PLACER.configure(DecoratorConfig.DEFAULT)));

this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 4, 0, 2));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SILVERFISH, 4, 0, 3));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2));
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/net/ludocrypt/backrooms/biome/Level2.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import net.ludocrypt.backrooms.features.LevelsFeatureInit;
import net.ludocrypt.backrooms.features.decorators.Level2RoomDecorator;
import net.minecraft.block.BlockState;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.gen.GenerationStep;
Expand All @@ -32,6 +34,12 @@ public Level2() {
this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS,
LevelsFeatureInit.LEVEL2ROOM.configure(FeatureConfig.DEFAULT)
.createDecoratedFeature(LEVEL2PLACER.configure(DecoratorConfig.DEFAULT)));

this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 2, 0, 2));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SILVERFISH, 2, 0, 3));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.VEX, 2, 0, 3));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2));

}

@Override
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/ludocrypt/backrooms/biome/Level3.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import net.ludocrypt.backrooms.features.LevelsFeatureInit;
import net.ludocrypt.backrooms.features.decorators.Level2RoomDecorator;
import net.minecraft.block.BlockState;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.gen.GenerationStep;
Expand All @@ -32,6 +34,11 @@ public Level3() {
this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS,
LevelsFeatureInit.LEVEL3ROOM.configure(FeatureConfig.DEFAULT)
.createDecoratedFeature(LEVEL3PLACER.configure(DecoratorConfig.DEFAULT)));

this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 2, 0, 2));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SILVERFISH, 2, 0, 3));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.VEX, 2, 0, 3));
this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2));
}

@Override
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/net/ludocrypt/backrooms/blocks/Carpet.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,43 +63,43 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
Item item = null;
switch (k) {
case 0:
item = Items.WHEAT_SEEDS;
item = Items.OAK_SAPLING;
break;
case 1:
item = Items.BEETROOT_SEEDS;
item = Items.OAK_SAPLING;
break;
case 2:
item = Items.OAK_SAPLING;
item = Items.BIRCH_SAPLING;
break;
case 3:
item = Items.JUNGLE_SAPLING;
break;
case 4:
item = Items.BEETROOT_SEEDS;
item = Items.PUMPKIN_SEEDS;
break;
case 5:
item = Items.BEETROOT_SEEDS;
item = Items.PUMPKIN_SEEDS;
break;
case 6:
item = Items.WHEAT_SEEDS;
item = Items.PUMPKIN_SEEDS;
break;
case 7:
item = Items.BEETROOT_SEEDS;
item = Items.MELON_SEEDS;
break;
case 8:
item = Items.WHEAT_SEEDS;
item = Items.MELON_SEEDS;
break;
case 9:
item = Items.BEETROOT_SEEDS;
item = Items.MELON_SEEDS;
break;
case 10:
item = Items.WHEAT_SEEDS;
item = Items.MELON_SEEDS;
break;
case 11:
item = Items.BEETROOT_SEEDS;
item = Items.MELON_SEEDS;
break;
case 12:
item = Items.WHEAT_SEEDS;
item = Items.MELON_SEEDS;
break;
}
ItemEntity entity = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/ludocrypt/backrooms/blocks/Tile.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ public BlockState getPlacementState(ItemPlacementContext ctx) {
if (ctx.getPlayerFacing() == Direction.EAST || ctx.getPlayerFacing() == Direction.WEST) {
return (BlockState) this.getDefaultState().with(FACING, Direction.EAST).with(SINGLE, true);
}
return (BlockState) this.getDefaultState().with(FACING, ctx.getPlayerFacing()).with(SINGLE, false);
return (BlockState) this.getDefaultState().with(FACING, ctx.getPlayerFacing().getOpposite()).with(SINGLE, false);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.minecraft.block.Material;
import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.AxeItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
Expand Down Expand Up @@ -46,7 +47,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
BlockHitResult hit) {
Random rand = world.random;
ItemStack itemStack = player.getStackInHand(hand);
if (itemStack.getItem() == Items.SHEARS) {
if (itemStack.getItem() == Items.SHEARS || itemStack.getItem() instanceof AxeItem) {
if (player instanceof ServerPlayerEntity && !player.isCreative()) {
itemStack.damage(1, rand, (ServerPlayerEntity) player);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/ludocrypt/backrooms/blocks/Wallpaper.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.minecraft.block.Material;
import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.AxeItem;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.server.network.ServerPlayerEntity;
Expand All @@ -35,7 +36,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
BlockHitResult hit) {
Random rand = world.random;
ItemStack itemStack = player.getStackInHand(hand);
if (itemStack.getItem() == Items.SHEARS) {
if (itemStack.getItem() == Items.SHEARS || itemStack.getItem() instanceof AxeItem) {
if (player instanceof ServerPlayerEntity && !player.isCreative()) {
itemStack.damage(1, rand, (ServerPlayerEntity) player);
}
Expand Down
Loading

0 comments on commit a7076eb

Please sign in to comment.