diff --git a/ForgeGradle-2.1-20151213.034144-13.jar.1 b/ForgeGradle-2.1-20151213.034144-13.jar.1 deleted file mode 100644 index 68587665d..000000000 Binary files a/ForgeGradle-2.1-20151213.034144-13.jar.1 and /dev/null differ diff --git a/Stripper.exe b/Stripper.exe deleted file mode 100644 index 6f6c74f4d..000000000 Binary files a/Stripper.exe and /dev/null differ diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt deleted file mode 100644 index 2354ef971..000000000 --- a/block_flattening_notes.txt +++ /dev/null @@ -1,72 +0,0 @@ -botania:altgrass[variant={dry, golden, vivid, scorched, infused, mutated}] -=> botania:dry_grass -=> botania:golden_grass -=> botania:vivid_grass -=> botania:scorched_grass -=> botania:infused_grass -=> botania:mutated_grass -reason: each is a different variant - -botania:storage[variant={manasteel, terrasteel, elementium, mana_diamond, terrasteel}] -=> botania:manasteel_block -=> botania:terrasteel_block -=> botania:elementium_block -=> botania:mana_diamond_block -=> botania:terrasteel_block -reason: each is a different variant - -botania:forestdrum[variant={wild, gathering, canopy}] -=> botania:drum_wild -=> botania:drum_gathering -=> botania:drum_canopy -reason: each is a different variant - -botania:custombrick[variant={azulejo_0, ..., azulejo_15}] -=> botania:azulejo_0 -=> ... -=> botania:azulejo_15 -(ordered 0, 13, 14, 15, then 1-12, due to legacy reasons) -reason: each is a different variant - -botania:pool[variant={default, creative, diluted, fabulous}, color={16 colors}] -=> botania:mana_pool[color={16 colors}] -=> botania:creative_pool[color={16 colors}] -=> botania:diluted_pool[color={16 colors}] -=> botania:fabulous_pool[color={16 colors}] -reason: each is a different variant, but changing the color only can be done by using an item on a existing pool, so no need to flatten the colors out - -botania:pylon[variant={mana, natura, gaia}] -=> botania:mana_pylon -=> botania:natura_pylon -=> botania:gaia_pylon -reason: each is a different variant - -botania:platform[variant={abstruse, spectral, infrangible}] -=> botania:abstruse_platform -=> botania:spectral_platform -=> botania:infrangible_platform -reason: each is a different variant - -botania:altar[variant={default, forest, plains, mountain, fungal, swamp, desert, taiga, mesa, mossy}] -=> botania:apothecary_ -reason: each is a different variant. mossy moved from actual state read from TE to a real separate block - -botania:opencrate[variant={open, crafty}, pattern={..}] -=> botania:opencrate -=> botania:craftcrate[pattern={..}] -reason: split open and crafty crate. Crafty patterns can stay blockstate properties since a pattern can only be changed by using an item on a existing crate - -botania:petalblock[color={16 colors}] -=> botania:{color}_petal_block -reason: each is a different variant - -botania:specialflower{nbt subtiles} -=> each will receive its own block ID. -=> subtiles still exist because the logic will need to be shared across normal/floating flowers etc. -=> there will also still be only one TE implementation (the benefits of flattening do not really apply much to TE's) -=> as before, addons should still be able to make their own subtile containers -=> however, the item and block forms of all flowers within botania will be flattened as it will simplify lots of logic - => mostly, to get rid of NBT variants on the itemblocks and allow the ability to use the vanilla Tags system - => addons are encouraged to flatten their standalone flowers - => the Item and Block implementations should be simplified and moved to the API to allow addons to extend them - => provide convenience methods in API to register a sane default Item and Block? diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 7b355d4a7..ffa2f94d1 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -50,8 +50,6 @@ public class WorldTypeSkyblock extends WorldType { @Nonnull @Override public ChunkGenerator createChunkGenerator(@Nonnull World world) { - // todo 1.14 world.setSeaLevel(64); - FlatGenerationSettings settings = new FlatGenerationSettings(); settings.setBiome(Biomes.PLAINS); settings.getFlatLayers().add(new FlatLayerInfo(1, Blocks.AIR)); diff --git a/src/main/resources/assets/botania/models/block/_make.bat b/src/main/resources/assets/botania/models/block/_make.bat deleted file mode 100644 index c4fb5a65f..000000000 --- a/src/main/resources/assets/botania/models/block/_make.bat +++ /dev/null @@ -1,41 +0,0 @@ -@echo off -:: Vazkii's JSON creator for blocks -:: Put in your /resources/assets/%modid%/models/block -:: Makes basic block JSON files as well as the acossiated item and simple blockstate -:: Can make multiple blocks at once -:: -:: Usage: -:: _make (block name 1) (block name 2) (block name x) -:: -:: Change this to your mod's ID -set modid=botania - -setlocal enabledelayedexpansion - -for %%x in (%*) do ( - echo Making %%x.json block - ( - echo { - echo "parent": "block/cube_all", - echo "textures": { - echo "all": "%modid%:blocks/%%x" - echo } - echo } - ) > %%x.json - - echo Making %%x.json item - ( - echo { - echo "parent": "%modid%:block/%%x" - echo } - ) > ../item/%%x.json - - echo Making %%x.json blockstate - ( - echo { - echo "variants": { - echo "normal": { "model": "%modid%:%%x" } - echo } - echo } - ) > ../../blockstates/%%x.json -)