Skip to content

Commit

Permalink
Update 1.3.1
Browse files Browse the repository at this point in the history
Check curse for changes
  • Loading branch information
LudoCrypt committed Sep 18, 2020
1 parent a2d01c6 commit 69f14e3
Show file tree
Hide file tree
Showing 90 changed files with 499 additions and 267 deletions.
7 changes: 0 additions & 7 deletions bin/main/assets/backrooms/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,6 @@
}
]
},
"tone": {
"sounds": [
{
"name": "backrooms:tone"
}
]
},
"tear": {
"sounds": [
{
Expand Down
3 changes: 2 additions & 1 deletion bin/main/backrooms.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"mixins": [
"GoToBackroomsMixin",
"MobSpawnLocationMixin",
"EntityMixin"
"EntityMixin",
"DefaultBiomeFeaturesMixin"
],
"client": [
"BuiltinModelItemRendererMixin",
Expand Down
11 changes: 6 additions & 5 deletions bin/main/data/backrooms/loot_tables/blocks/light.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"children": [
{
"type": "minecraft:item",
"name": "backrooms:light",
"conditions": [
{
"condition": "minecraft:match_tool",
Expand All @@ -23,17 +24,17 @@
]
}
}
],
"name": "backrooms:light"
]
},
{
"type": "minecraft:item",
"type": "minecraft:loot_table",
"weight": 10,
"name": "backrooms:light_dusts",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "minecraft:air"
]
}
]
}
Expand Down
74 changes: 62 additions & 12 deletions bin/main/data/backrooms/loot_tables/blocks/pipe.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,64 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "backrooms:pipe"
}
]
}
]
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "backrooms:pipe"
},
{
"type": "minecraft:alternatives",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.05,
0.0564882,
0.15,
1.0
]
}
],
"name": "minecraft:iron_ingot"
},
{
"type": "minecraft:item",
"name": "backrooms:pipe"
}
]
}
]
}
]
}
]
}
4 changes: 2 additions & 2 deletions bin/main/data/backrooms/recipes/cement.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
],
"key": {
"#": {
"item": "minecraft:white_concrete"
"item": "minecraft:cobblestone"
},
"L": {
"item": "minecraft:light_gray_concrete"
"item": "minecraft:stone"
}
},
"result": {
Expand Down
15 changes: 10 additions & 5 deletions bin/main/data/backrooms/recipes/light.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"#W"
"###",
"EEE",
"#$#"
],
"key": {
"#": {
"item": "minecraft:redstone_lamp"
"item": "minecraft:white_stained_glass_pane"
},
"W": {
"item": "minecraft:white_dye"
"E": {
"item": "minecraft:end_rod"
},
"$": {
"item": "minecraft:repeater"
}
},
"result": {
"item": "backrooms:light",
"count": 1
"count": 4
}
}
14 changes: 4 additions & 10 deletions bin/main/data/backrooms/recipes/tile.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"#L",
"BG"
"#&",
"&#"
],
"key": {
"#": {
"item": "minecraft:white_concrete"
},
"L": {
"item": "minecraft:light_gray_concrete"
},
"B": {
"item": "minecraft:black_concrete"
},
"G": {
"item": "minecraft:gray_concrete"
"&": {
"item": "minecraft:diorite"
}
},
"result": {
Expand Down
2 changes: 1 addition & 1 deletion bin/main/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "backrooms",
"version": "$version",
"name": "The Backrooms",
"description": "The backrooms, endless mono yellow rooms to traverse.",
"description": "The backrooms, endless mono yellow rooms to traverse, and many more levels to come. Music by Angel Craig & LudoCrypt.",
"authors": [
"LudoCrypt",
"Angel Craig"
Expand Down
Binary file modified bin/main/net/ludocrypt/backrooms/Backrooms.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/BackroomsClient.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Cement.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Cement_Bricks.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Checkered_Block.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/LinedPipe.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Pipe.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Poolstone.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Poolstone_Bricks.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Poolstone_Path.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Poolstone_Tile.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Smooth_Poolstone.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/Vent.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/VoidBlock.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/blocks/Wall.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/features/Level0DottedRoom.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/features/Level0RedRoom.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/features/Level0Room.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/features/Level1Room.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/features/LevelsFeatureInit.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/misc/BackroomsSoundEvents.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/mixin/MusicMixin.class
Binary file not shown.
Binary file modified bin/main/net/ludocrypt/backrooms/mixin/TitleScreenMixin.class
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx2G
mod_version = 1.3.0
mod_version = 1.3.1
maven_group = net.ludocrypt
archives_base_name = the-backrooms

Expand Down
59 changes: 35 additions & 24 deletions src/main/java/net/ludocrypt/backrooms/Backrooms.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
import net.ludocrypt.backrooms.biome.BkBiomeKeys;
import net.ludocrypt.backrooms.biome.BkBuiltInBiomes;
import net.ludocrypt.backrooms.biome.ConfiguratedSurfaceBuilders;
import net.ludocrypt.backrooms.biome.SurfaceBuilders;
Expand Down Expand Up @@ -53,6 +52,8 @@
import net.minecraft.block.Block;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.entity.Entity;
import net.minecraft.entity.decoration.painting.PaintingMotive;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItem;
Expand All @@ -64,7 +65,13 @@
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import net.minecraft.util.Rarity;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.gen.decorator.Decorator;
import net.minecraft.world.gen.decorator.RangeDecoratorConfig;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreFeatureConfig;

public class Backrooms implements ModInitializer {
// loot tables
Expand All @@ -73,8 +80,6 @@ public class Backrooms implements ModInitializer {
public static final Identifier LEVEL1CHEST = register("backrooms:chests/level1");
public static final Identifier LEVEL3CHEST = register("backrooms:chests/level3");
// variables
public static boolean Display = false;
public static int DisplayLevel = 0;
public static final String MOD_ID = "backrooms";
public static PlayerEntity teleportedEntity = null;
public static long SEED = 0;
Expand Down Expand Up @@ -200,9 +205,11 @@ public class Backrooms implements ModInitializer {
public static final PaintingMotive SEA_LIFE = new PaintingMotive(64, 64);
public static final PaintingMotive WOLF = new PaintingMotive(64, 64);

// builders
// public static SurfaceBuilder<TernarySurfaceConfig> LEVELBUILDER;
// public static ConfiguredSurfaceBuilder<TernarySurfaceConfig> CONFIGUREDLEVELBUILDER;
// Configured Features
public static ConfiguredFeature<?, ?> POOLSTONE_GENERATION = Feature.ORE
.configure(
new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, POOLSTONE.getDefaultState(), 15))
.decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(0, 5, 50))).spreadHorizontally().repeat(4);

// identifier
public static Identifier getId(String id) {
Expand All @@ -211,32 +218,36 @@ public static Identifier getId(String id) {

@Override
public void onInitialize() {
// Features
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier("backrooms", "poolstone_blob"),
POOLSTONE_GENERATION);
// commands
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> {
dispatcher.register(CommandManager.literal("backrooms").requires(source -> source.hasPermissionLevel(2))
.then(CommandManager.literal("level").then(CommandManager.literal("0").executes(context -> {
PlayerEntity player = context.getSource().getPlayer();
player.moveToWorld(player.getServer().getWorld(BDimension.LEVEL0WORLD));
return 1;
})).then(CommandManager.literal("1").executes(context -> {
PlayerEntity player = context.getSource().getPlayer();
player.moveToWorld(player.getServer().getWorld(BDimension.LEVEL1WORLD));
return 1;
})).then(CommandManager.literal("2").executes(context -> {
PlayerEntity player = context.getSource().getPlayer();
player.moveToWorld(player.getServer().getWorld(BDimension.LEVEL2WORLD));
return 1;
})).then(CommandManager.literal("3").executes(context -> {
PlayerEntity player = context.getSource().getPlayer();
player.moveToWorld(player.getServer().getWorld(BDimension.LEVEL3WORLD));
return 1;
}))));
.then(CommandManager.literal("tp").then(CommandManager
.argument("entity", EntityArgumentType.entities())
.then(CommandManager.literal("level").then(CommandManager.literal("0").executes(context -> {
Entity entity = EntityArgumentType.getEntity(context, "entity");
entity.moveToWorld(entity.getServer().getWorld(BDimension.LEVEL0WORLD));
return 1;
})).then(CommandManager.literal("1").executes(context -> {
Entity entity = EntityArgumentType.getEntity(context, "entity");
entity.moveToWorld(entity.getServer().getWorld(BDimension.LEVEL1WORLD));
return 1;
})).then(CommandManager.literal("2").executes(context -> {
Entity entity = EntityArgumentType.getEntity(context, "entity");
entity.moveToWorld(entity.getServer().getWorld(BDimension.LEVEL2WORLD));
return 1;
})).then(CommandManager.literal("3").executes(context -> {
Entity entity = EntityArgumentType.getEntity(context, "entity");
entity.moveToWorld(entity.getServer().getWorld(BDimension.LEVEL3WORLD));
return 1;
}))))));
});
// dimensions
BDimension.register();
// biomes
LevelsFeatureInit.registerFeatures();
BkBiomeKeys.turnOn();
BkBuiltInBiomes.turnOn();
ConfiguratedSurfaceBuilders.turnOn();
SurfaceBuilders.turnOn();
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/net/ludocrypt/backrooms/BackroomsClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

@Environment(EnvType.CLIENT)
public class BackroomsClient implements ClientModInitializer {
// variables
public static boolean Display = false;
public static int DisplayLevel = 0;

private static Map<Item, RenderLayer> itemRenderLayerMap = new HashMap<Item, RenderLayer>();

@Override
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/net/ludocrypt/backrooms/biome/BkBiomeKeys.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,4 @@ public abstract class BkBiomeKeys {
private static RegistryKey<Biome> register(Identifier id) {
return RegistryKey.of(Registry.BIOME_KEY, id);
}

public static void turnOn() {
}
}
Loading

0 comments on commit 69f14e3

Please sign in to comment.