mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-12-22 19:39:24 +01:00
yeet
This commit is contained in:
Flanks255
parent
a8ab7e8ed8
commit
21a57f2ac9
11 changed files with 8 additions and 74 deletions
4
port.MD
4
port.MD
|
|
@ -6,7 +6,7 @@
|
|||
- [ ] Treasure chests
|
||||
- [ ] Composter and bio-mash, biomass, bio coal and fertilizer
|
||||
- [x] Charcoal blocks
|
||||
- [ ] Ender pearl blocks
|
||||
- [x] Ender pearl blocks
|
||||
- [x] ESDs
|
||||
- [ ] Fishing nets
|
||||
- [ ] Solar panels
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
- [ ] Knife (food can just be crafted normally)
|
||||
- [ ] Black lotuses and black dye
|
||||
- [ ] Chest to storage crate upgrade (makes little sense with the way they are being changed), keep the other ones though
|
||||
- [ ] Ring of liquid banning
|
||||
- [x] Ring of liquid banning
|
||||
- [x] Emerald and obsidian armor and tools
|
||||
- [x] Black quartz armor and tools
|
||||
- [x] Crystal armor and tools (why did I ever make this)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ fac9e12aa8a752acf65ccba51ffedaa3c3354427 assets/actuallyadditions/blockstates/em
|
|||
b6284a46d822974f2226585c89746091b238ead2 assets/actuallyadditions/blockstates/empowered_void_crystal_block.json
|
||||
e0dc3c1b041fcfb6508bebb1c15f07fcdf297241 assets/actuallyadditions/blockstates/empowerer.json
|
||||
8e3e99cd4fd18762ceac1b265543976fc904225c assets/actuallyadditions/blockstates/ender_casing.json
|
||||
728003592363b2e9be11e9b808b19495761a9a42 assets/actuallyadditions/blockstates/ender_pearl_block.json
|
||||
32f6644e58fcab052e406837056f882a7754ac74 assets/actuallyadditions/blockstates/energizer.json
|
||||
a3c46ac1c997e30f9fb4ecff56dbd573ddf8135d assets/actuallyadditions/blockstates/enervator.json
|
||||
ac4f3f406105875df9f544407fa90ea309b0fc0e assets/actuallyadditions/blockstates/enori_crystal_block.json
|
||||
|
|
@ -170,7 +169,6 @@ c0057069962a7fc59ecd0f37160e55ede2f581e4 assets/actuallyadditions/models/block/e
|
|||
8d49c44b137a3d59a4128acfdffaf78553148a72 assets/actuallyadditions/models/block/empowered_restonia_crystal_block.json
|
||||
a45f3846f8637a6b66d613d5a185a792e25ac77d assets/actuallyadditions/models/block/empowered_void_crystal_block.json
|
||||
915095a6b35cf3bc2cf8b501c06e3fb8847cbeae assets/actuallyadditions/models/block/ender_casing.json
|
||||
3f86a2ce93e109ef575273c43edc075bc919de76 assets/actuallyadditions/models/block/ender_pearl_block.json
|
||||
17e75d9c9dd4c1e5de89bbd69c8f145b7c05cec0 assets/actuallyadditions/models/block/enori_crystal_block.json
|
||||
5b274d745475e1f01d9f0565531447e9da86ad6a assets/actuallyadditions/models/block/ethetic_green_block.json
|
||||
4ad1c0a88d09f1f0dc670ba69b76ba0afea2ae94 assets/actuallyadditions/models/block/ethetic_green_slab.json
|
||||
|
|
@ -324,7 +322,6 @@ c70272562c084ce2a04933ca04e270f9b3493cf4 assets/actuallyadditions/models/item/em
|
|||
88457aa73c273fb512b5c4103a1183e93dcec412 assets/actuallyadditions/models/item/empowerer.json
|
||||
8c5fb751f1795df8cec1100368b153ab02d003d4 assets/actuallyadditions/models/item/empty_cup.json
|
||||
0d0fd6b7df3a378a58cd35168fb0e1c3d54c6b03 assets/actuallyadditions/models/item/ender_casing.json
|
||||
5afcb323c7e19f36edfcb8cd33652a6f75aa7c49 assets/actuallyadditions/models/item/ender_pearl_block.json
|
||||
ae5bd154f7863b88fab008caca78867dd4d29aa5 assets/actuallyadditions/models/item/ender_star.json
|
||||
9d011453796b6a4aa0ac86679fe27fad6b0e3337 assets/actuallyadditions/models/item/energizer.json
|
||||
df3d37e900946dc1198f04c837de897089528847 assets/actuallyadditions/models/item/enervator.json
|
||||
|
|
@ -500,7 +497,6 @@ aeb229c0c9a5d5f4682430ed4ec78c123e7e871b data/actuallyadditions/loot_tables/bloc
|
|||
3b23c1416f7227cdd3c05033cd097e4e95048a12 data/actuallyadditions/loot_tables/blocks/empowered_void_crystal_block.json
|
||||
e0ae0923455cc2eedfdfc826d8c408b23373997c data/actuallyadditions/loot_tables/blocks/empowerer.json
|
||||
8b9f76383b14f0d814126a3279fcf4d4b84867e3 data/actuallyadditions/loot_tables/blocks/ender_casing.json
|
||||
7a4b3e9c61d1a96bca168611f53edf763d3c6f61 data/actuallyadditions/loot_tables/blocks/ender_pearl_block.json
|
||||
872ba64002408040096e08a340b956b35c261f57 data/actuallyadditions/loot_tables/blocks/energizer.json
|
||||
ce52e2261acccd8092f6033eaa24cb7eb0ace776 data/actuallyadditions/loot_tables/blocks/enervator.json
|
||||
0310ab57594d1bbbdfc20043a4bbf6a522207e74 data/actuallyadditions/loot_tables/blocks/enori_crystal_block.json
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "actuallyadditions:block/ender_pearl_block"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "actuallyadditions:block/ender_pearl_block"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/ender_pearl_block"
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "actuallyadditions:ender_pearl_block"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -156,7 +156,6 @@ public class BlockStateGenerator extends BlockStateProvider {
|
|||
|
||||
|
||||
buildCubeAll(ActuallyBlocks.ENDER_CASING);
|
||||
buildCubeAll(ActuallyBlocks.ENDER_PEARL_BLOCK);
|
||||
buildCubeAll(ActuallyBlocks.IRON_CASING);
|
||||
standardBlock(ActuallyBlocks.LAVA_FACTORY_CASING);
|
||||
buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_ORE);
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ public class LootTableGenerator extends LootTableProvider {
|
|||
this.dropSelf(ActuallyBlocks.LAMP_RED.get());
|
||||
this.dropSelf(ActuallyBlocks.LAMP_BLACK.get());
|
||||
this.dropSelf(ActuallyBlocks.LAMP_CONTROLLER.get());
|
||||
this.dropSelf(ActuallyBlocks.ENDER_PEARL_BLOCK.get());
|
||||
this.dropSelf(ActuallyBlocks.ENDER_CASING.get());
|
||||
this.dropSelf(ActuallyBlocks.IRON_CASING.get());
|
||||
//this.dropSelf(ActuallyBlocks.IRON_CASING_SNOW.get());
|
||||
|
|
|
|||
|
|
@ -210,8 +210,6 @@ public final class ActuallyBlocks {
|
|||
|
||||
|
||||
// Misc building blocks
|
||||
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ENDER_PEARL_BLOCK = new AABlockReg<>("ender_pearl_block", () -> new ActuallyBlock(miscBlockProperties),
|
||||
(b) -> new AABlockItem(b, defaultBlockItemProperties));
|
||||
public static final AABlockReg<ActuallyBlock, AABlockItem, ?> BLACK_QUARTZ_ORE = new AABlockReg<>("black_quartz_ore", () -> new ActuallyBlock(miscBlockProperties),
|
||||
(b) -> new AABlockItem(b, defaultBlockItemProperties));
|
||||
|
||||
|
|
|
|||
|
|
@ -226,12 +226,7 @@ public final class BlockCrafting {
|
|||
// //Leaf Generator
|
||||
// RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockLeafGenerator), "IEI", "GLG", "ICI", 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'G', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'L', "treeLeaves", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()));
|
||||
// recipeLeafGen = RecipeUtil.lastIRecipe();
|
||||
//
|
||||
// //Enderpearl Block
|
||||
// RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), "EE", "EE", 'E', Items.ENDER_PEARL);
|
||||
// recipeEnderPearlBlock = RecipeUtil.lastIRecipe();
|
||||
// RecipeHandler.addShapelessOreDictRecipe(new ItemStack(Items.ENDER_PEARL, 4), new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()));
|
||||
//
|
||||
|
||||
// //Quartz Block
|
||||
// RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), "QQ", "QQ", 'Q', "gemQuartzBlack");
|
||||
// recipeQuartzBlock = RecipeUtil.lastIRecipe();
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@
|
|||
"block.actuallyadditions.rice": "Rice Plant",
|
||||
"block.actuallyadditions.charcoal": "Block of Charcoal",
|
||||
"block.actuallyadditions.coal_generator": "Coal Generator",
|
||||
"block.actuallyadditions.lamp_powerer": "Lamp Controller",
|
||||
"block.actuallyadditions.lamp_controller": "Lamp Controller",
|
||||
"block.actuallyadditions.lamp_white": "White Lamp",
|
||||
"block.actuallyadditions.lamp_orange": "Orange Lamp",
|
||||
"block.actuallyadditions.lamp_magenta": "Magenta Lamp",
|
||||
|
|
@ -333,27 +333,9 @@
|
|||
"item.actuallyadditions.hairy_ball": "Ball of Fur",
|
||||
"item.actuallyadditions.leaf_blower": "Leaf Blower",
|
||||
"item.actuallyadditions.advanced_leaf_blower": "Advanced Leaf Blower",
|
||||
"item.actuallyadditions.knife": "Knife",
|
||||
"item.actuallyadditions.crafter_on_a_stick": "Crafting Table On A Stick",
|
||||
"item.actuallyadditions.food_baguette": "Baguette",
|
||||
"item.actuallyadditions.food_pizza": "Pizza",
|
||||
"item.actuallyadditions.food_hamburger": "Hamburger",
|
||||
"item.actuallyadditions.food_big_cookie": "Big Cookie",
|
||||
"item.actuallyadditions.food_submarine_sandwich": "Submarine Sandwich",
|
||||
"item.actuallyadditions.food_toast": "Toast",
|
||||
"item.actuallyadditions.food_chocolate_toast": "Toast o' Chocolate",
|
||||
"item.actuallyadditions.food_chocolate": "Chocolate",
|
||||
"item.actuallyadditions.food_chocolate_cake": "Chocolate Cake",
|
||||
"item.actuallyadditions.food_noodle": "Noodle",
|
||||
"item.actuallyadditions.food_spaghetti": "Spaghetti",
|
||||
"item.actuallyadditions.food_french_fry": "French Fry",
|
||||
"item.actuallyadditions.food_french_fries": "French Fries",
|
||||
"item.actuallyadditions.food_fish_n_chips": "Fish 'N' Chips",
|
||||
"item.actuallyadditions.food_carrot_juice": "Carrot Juice",
|
||||
"item.actuallyadditions.food_pumpkin_stew": "Pumpkin Stew",
|
||||
"item.actuallyadditions.food_cheese": "Cheese",
|
||||
"item.actuallyadditions.coil": "Basic Coil",
|
||||
"item.actuallyadditions.coil_advanced": "Advanced Coil",
|
||||
"item.actuallyadditions.basic_coil": "Basic Coil",
|
||||
"item.actuallyadditions.advanced_coil": "Advanced Coil",
|
||||
"item.actuallyadditions.potion_ring": "Ring of",
|
||||
"item.actuallyadditions.potion_ring_advanced": "Advanced Ring of",
|
||||
"item.actuallyadditions.solidified_experience": "Solidified Experience",
|
||||
|
|
@ -463,9 +445,9 @@
|
|||
"item.actuallyadditions.biocoal": "Bio Coal",
|
||||
"item.actuallyadditions.player_probe": "Player Probe",
|
||||
"item.actuallyadditions.worm": "Worm",
|
||||
"item.actuallyadditions.bag": "Traveler's Sack",
|
||||
"item.actuallyadditions.travelers_sack": "Traveler's Sack",
|
||||
"item.actuallyadditions.bag.storage": "filled slots",
|
||||
"item.actuallyadditions.void_bag": "Void Sack",
|
||||
"item.actuallyadditions.void_sack": "Void Sack",
|
||||
"item.actuallyadditions.crystallized_canola_seed": "Crystallized Canola Seed",
|
||||
"item.actuallyadditions.empowered_canola_seed": "Empowered Canola Seed",
|
||||
"item.actuallyadditions.mining_lens": "Lens of the Miner",
|
||||
|
|
|
|||
Loading…
Reference in a new issue