diff --git a/gradle.properties b/gradle.properties index 4638ea6..53aa6ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.12.6 # Mod Properties - mod_version = 0.1.0-pre1 + mod_version = 0.1.1 maven_group = net.tigereye.lava-java archives_base_name = lava-java diff --git a/src/main/java/net/tigereye/lavajava/config/LJConfig.java b/src/main/java/net/tigereye/lavajava/config/LJConfig.java index e46b27c..e28f4a8 100644 --- a/src/main/java/net/tigereye/lavajava/config/LJConfig.java +++ b/src/main/java/net/tigereye/lavajava/config/LJConfig.java @@ -12,7 +12,7 @@ public class LJConfig implements ConfigData { public int CAFE_REFRESH_PERIOD = 3200; public int MAX_BARISTAS_PER_CAFE = 2; - public int CAFE_AVERAGE_DISTANCE_CHUNKS = 2; + public int CAFE_AVERAGE_DISTANCE_CHUNKS = 8; public int CAFE_MINIMUM_DISTANCE_CHUNKS = 2; public float DURATION_LOST_PER_STAGE = .2f; } diff --git a/src/main/java/net/tigereye/lavajava/mob/WitherBaristaEntity.java b/src/main/java/net/tigereye/lavajava/mob/WitherBaristaEntity.java index dbf79c2..13b45fd 100644 --- a/src/main/java/net/tigereye/lavajava/mob/WitherBaristaEntity.java +++ b/src/main/java/net/tigereye/lavajava/mob/WitherBaristaEntity.java @@ -292,16 +292,16 @@ private static Int2ObjectMap<TradeOffers.Factory[]> copyToFastUtilMap(ImmutableM static { WITHER_BARISTA_TRADES = copyToFastUtilMap(ImmutableMap.of( 1, new TradeOffers.Factory[]{ - new SellItemFactory(Items.COOKIE, 2, 1, 32, 1), + new SellItemFactory(Items.COOKIE, 2, 1, 8, 1), new SellLavaJavaFactory(0)}, 2, new TradeOffers.Factory[]{ new SellLavaJavaFactory(1), new SellLavaJavaFactory(1)}, 3, new TradeOffers.Factory[]{ - new SellItemFactory(Items.PUMPKIN_PIE, 8, 1, 8, 4), + new SellItemFactory(Items.PUMPKIN_PIE, 8, 1, 3, 4), new SellLavaJavaFactory(2)}, 4, new TradeOffers.Factory[]{ - new SellItemFactory(Blocks.CAKE, 16, 1, 2, 8), + new SellItemFactory(Blocks.CAKE, 16, 1, 1, 8), new SellLavaJavaFactory(3)}, 5, new TradeOffers.Factory[]{ new SellLavaJavaFactory(4), diff --git a/src/main/java/net/tigereye/lavajava/register/LJEntities.java b/src/main/java/net/tigereye/lavajava/register/LJEntities.java index db3940d..b932d0c 100644 --- a/src/main/java/net/tigereye/lavajava/register/LJEntities.java +++ b/src/main/java/net/tigereye/lavajava/register/LJEntities.java @@ -13,7 +13,7 @@ public class LJEntities { public static final EntityType<WitherBaristaEntity> WITHER_BARISTA = Registry.register( Registry.ENTITY_TYPE, new Identifier("lavajava", "wither_barista"), - FabricEntityTypeBuilder.create(SpawnGroup.CREATURE, WitherBaristaEntity::new).dimensions(EntityDimensions.fixed(WitherBaristaEntity.WIDTH, WitherBaristaEntity.HEIGHT)).build() + FabricEntityTypeBuilder.create(SpawnGroup.CREATURE, WitherBaristaEntity::new).fireImmune().dimensions(EntityDimensions.fixed(WitherBaristaEntity.WIDTH, WitherBaristaEntity.HEIGHT)).build() ); public static void register(){ diff --git a/src/main/resources/data/lavajava/loot_tables/chests/lava_java_cafe_barrel.json b/src/main/resources/data/lavajava/loot_tables/chests/lava_java_cafe_barrel.json new file mode 100644 index 0000000..b243d75 --- /dev/null +++ b/src/main/resources/data/lavajava/loot_tables/chests/lava_java_cafe_barrel.json @@ -0,0 +1,97 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": { + "type": "minecraft:uniform", + "min": 7.0, + "max": 15.0 + }, + "bonus_rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "weight": 4, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 3.0 + }, + "add": false + } + ], + "name": "minecraft:gold_ingot" + }, + { + "type": "minecraft:item", + "weight": 40, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 2.0, + "max": 6.0 + }, + "add": false + } + ], + "name": "minecraft:gold_nugget" + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:ghast_tear" + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "minecraft:sugar" + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "minecraft:melon_slice" + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "minecraft:magma_cream" + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "minecraft:blaze_powder" + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "minecraft:glowstone_dust" + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "minecraft:phantom_membrane" + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:lava_bucket" + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:lava_bucket" + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "minecraft:rabbit_foot" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/lavajava/structures/lava_java_cafe.nbt b/src/main/resources/data/lavajava/structures/lava_java_cafe.nbt index 3f31cd9..025cd60 100644 Binary files a/src/main/resources/data/lavajava/structures/lava_java_cafe.nbt and b/src/main/resources/data/lavajava/structures/lava_java_cafe.nbt differ