Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

THIS IS A REALLY HUGE COMMIT HI

Browse source
This commit is contained in:
Ellpeck 2016-11-20 03:44:44 +01:00
parent 2a13f43378
commit bfd7c0fa1f
1171 changed files with 2144 additions and 2115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java
View file

@ -32,15 +32,15 @@ public final class InitFluids{
public static Block blockEmpoweredOil;
public static void init(){
fluidCanolaOil = registerFluid("canolaoil", "blockCanolaOil", EnumRarity.UNCOMMON);
fluidOil = registerFluid("oil", "blockOil", EnumRarity.UNCOMMON);
fluidCrystalOil = registerFluid("crystaloil", "blockCrystalOil", EnumRarity.RARE);
fluidEmpoweredOil = registerFluid("empoweredoil", "blockEmpoweredOil", EnumRarity.EPIC);
fluidCanolaOil = registerFluid("canolaoil", "block_canola_oil", EnumRarity.UNCOMMON);
fluidOil = registerFluid("oil", "block_oil", EnumRarity.UNCOMMON);
fluidCrystalOil = registerFluid("crystaloil", "block_crystal_oil", EnumRarity.RARE);
fluidEmpoweredOil = registerFluid("empoweredoil", "block_empowered_oil", EnumRarity.EPIC);
blockCanolaOil = registerFluidBlock(fluidCanolaOil, Material.WATER, "blockCanolaOil");
blockOil = registerFluidBlock(fluidOil, Material.WATER, "blockOil");
blockCrystalOil = registerFluidBlock(fluidCrystalOil, Material.WATER, "blockCrystalOil");
blockEmpoweredOil = registerFluidBlock(fluidEmpoweredOil, Material.WATER, "blockEmpoweredOil");
blockCanolaOil = registerFluidBlock(fluidCanolaOil, Material.WATER, "block_canola_oil");
blockOil = registerFluidBlock(fluidOil, Material.WATER, "block_oil");
blockCrystalOil = registerFluidBlock(fluidCrystalOil, Material.WATER, "block_crystal_oil");
blockEmpoweredOil = registerFluidBlock(fluidEmpoweredOil, Material.WATER, "block_empowered_oil");
}
private static Fluid registerFluid(String fluidName, String fluidTextureName, EnumRarity rarity){

18
src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
View file

@ -34,16 +34,16 @@ public final class InitArmorMaterials{
public static void init(){
ModUtil.LOGGER.info("Initializing Armor Materials...");
armorMaterialEmerald = addArmorMaterial("armorMaterialEmerald", ModUtil.MOD_ID+":armorEmerald", 50, new int[]{5, 8, 9, 4}, 15, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialObsidian = addArmorMaterial("armorMaterialObsidian", ModUtil.MOD_ID+":armorObsidian", 120, new int[]{1, 3, 4, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialQuartz = addArmorMaterial("armorMaterialQuartz", ModUtil.MOD_ID+":armorQuartz", 20, new int[]{3, 5, 6, 3}, 8, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialEmerald = addArmorMaterial("armorMaterialEmerald", ModUtil.MOD_ID+":armor_emerald", 50, new int[]{5, 8, 9, 4}, 15, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialObsidian = addArmorMaterial("armorMaterialObsidian", ModUtil.MOD_ID+":armor_obsidian", 120, new int[]{1, 3, 4, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialQuartz = addArmorMaterial("armorMaterialQuartz", ModUtil.MOD_ID+":armor_quartz", 20, new int[]{3, 5, 6, 3}, 8, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalRed = addArmorMaterial("armorMaterialCrystalRed", ModUtil.MOD_ID+":armorCrystalRed", 18, new int[]{3, 6, 7, 3}, 9, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalBlue = addArmorMaterial("armorMaterialCrystalBlue", ModUtil.MOD_ID+":armorCrystalBlue", 18, new int[]{3, 6, 7, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalLightBlue = addArmorMaterial("armorMaterialCrystalLightBlue", ModUtil.MOD_ID+":armorCrystalLightBlue", 35, new int[]{4, 7, 8, 4}, 12, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalBlack = addArmorMaterial("armorMaterialCrystalBlack", ModUtil.MOD_ID+":armorCrystalBlack", 12, new int[]{1, 3, 4, 1}, 13, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalGreen = addArmorMaterial("armorMaterialCrystalGreen", ModUtil.MOD_ID+":armorCrystalGreen", 60, new int[]{6, 9, 9, 4}, 18, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalWhite = addArmorMaterial("armorMaterialCrystalWhite", ModUtil.MOD_ID+":armorCrystalWhite", 18, new int[]{3, 6, 6, 3}, 11, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalRed = addArmorMaterial("armorMaterialCrystalRed", ModUtil.MOD_ID+":armor_crystal_red", 18, new int[]{3, 6, 7, 3}, 9, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalBlue = addArmorMaterial("armorMaterialCrystalBlue", ModUtil.MOD_ID+":armor_crystal_blue", 18, new int[]{3, 6, 7, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalLightBlue = addArmorMaterial("armorMaterialCrystalLightBlue", ModUtil.MOD_ID+":armor_crystal_light_blue", 35, new int[]{4, 7, 8, 4}, 12, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalBlack = addArmorMaterial("armorMaterialCrystalBlack", ModUtil.MOD_ID+":armor_crystal_black", 12, new int[]{1, 3, 4, 1}, 13, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalGreen = addArmorMaterial("armorMaterialCrystalGreen", ModUtil.MOD_ID+":armor_crystal_green", 60, new int[]{6, 9, 9, 4}, 18, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
armorMaterialCrystalWhite = addArmorMaterial("armorMaterialCrystalWhite", ModUtil.MOD_ID+":armor_crystal_white", 18, new int[]{3, 6, 6, 3}, 11, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC);
}
private static ArmorMaterial addArmorMaterial(String name, String textureName, int durability, int[] reductionAmounts, int enchantability, SoundEvent soundOnEquip){

8
src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java
View file

@ -21,10 +21,10 @@ import java.util.Locale;
public final class BannerHelper{
public static void init(){
addCraftingPattern("Drill", new ItemStack(InitItems.itemDrill, 1, 3));
addCraftingPattern("LeafBlo", new ItemStack(InitItems.itemLeafBlower));
addCraftingPattern("PhanCon", new ItemStack(InitItems.itemPhantomConnector));
addCraftingPattern("Book", new ItemStack(InitItems.itemBooklet));
addCraftingPattern("drill", new ItemStack(InitItems.itemDrill, 1, 3));
addCraftingPattern("leaf_blo", new ItemStack(InitItems.itemLeafBlower));
addCraftingPattern("phan_con", new ItemStack(InitItems.itemPhantomConnector));
addCraftingPattern("book", new ItemStack(InitItems.itemBooklet));
}
/**

29
src/main/resources/assets/Rename.py Normal file
View file

@ -0,0 +1,29 @@
import re, os, fnmatch
def fix_file_contents(filename):
with open(filename, "r") as file:
data = file.read()
reg = 'actuallyadditions:[a-z]+\/([a-zA-z]+)'
for found in re.findall(reg, data):
data = data.replace(found, rename(found))
reg = 'actuallyadditions:([a-zA-z]+)'
for found in re.findall(reg, data):
data = data.replace(found, rename(found))
with open(filename, "w") as file:
file.write(data)
def rename(oldName):
reg = '[A-Z]?[a-z.]+'
parts = re.findall(reg, oldName)
newString = parts[0]
for part in parts[1:]:
newString += "_" + part.lower()
print(newString)
return newString
if __name__ == "__main__":
cwd = os.getcwd()
for subdir, dirs, files in os.walk(cwd):
for file in files:
if fnmatch.fnmatch(file, "*.png"):
os.rename(os.path.join(subdir, file), os.path.join(subdir, rename(file)))

19
src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzWall.json
View file

@ -1,19 +0,0 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:blockChiseledQuartzWallPost" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "y": 270, "uvlock": true }
}
]
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockFermentingBarrel",
"textures": {
"particle": "actuallyadditions:blocks/blockFermentingBarrel"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockGiantChest",
"textures": {
"particle": "actuallyadditions:blocks/blockGiantChest"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockGiantChestLarge.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockGiantChestLarge",
"textures": {
"particle": "actuallyadditions:blocks/blockGiantChest"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockGiantChestMedium.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockGiantChestMedium",
"textures": {
"particle": "actuallyadditions:blocks/blockGiantChest"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockInputterAdvanced"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

16
src/main/resources/assets/actuallyadditions/blockstates/blockItemRepairer.json
View file

@ -1,16 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockItemRepairer",
"bottom": "actuallyadditions:blocks/blockItemRepairerBottom",
"top": "actuallyadditions:blocks/blockItemRepairerTop"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

22
src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItemWhitelist.json
View file

@ -1,22 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockLaserRelay",
"textures": {
"particle": "actuallyadditions:blocks/models/modelLaserRelayItemWhitelist"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "x": 180 },
"1": {},
"2": { "x": 90 },
"3": { "x": 270 },
"4": { "x": 90, "y": 270 },
"5": { "x": 270, "y": 270 }
}
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockLeafGenerator.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockLeafGenerator"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPhantomBreaker"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPhantomEnergyface"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPhantomLiquiface"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPhantomPlacer"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

19
src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzWall.json
View file

@ -1,19 +0,0 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:blockPillarQuartzWallPost" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "y": 270, "uvlock": true }
}
]
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockPlayerInterface.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPlayerInterface"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

19
src/main/resources/assets/actuallyadditions/blockstates/blockQuartzWall.json
View file

@ -1,19 +0,0 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:blockQuartzWallPost" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:blockQuartzWallSide", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:blockQuartzWallSide", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:blockQuartzWallSide", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:blockQuartzWallSide", "y": 270, "uvlock": true }
}
]
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockRangedCollector.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockRangedCollector"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockShockSuppressor.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockShockAbsorber"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

21
src/main/resources/assets/actuallyadditions/blockstates/blockSmileyCloud.json
View file

@ -1,21 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockSmileyCloud",
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "y" : 0},
"1": { "y" : 180 },
"2": { "y" : 270 },
"3": { "y" : 90 },
"4": { "y" : 0, "model": "actuallyadditions:blockSmileyCloudFluffy" },
"5": { "y" : 180, "model": "actuallyadditions:blockSmileyCloudFluffy" },
"6": { "y" : 270, "model": "actuallyadditions:blockSmileyCloudFluffy" },
"7": { "y" : 90, "model": "actuallyadditions:blockSmileyCloudFluffy" }
}
}
}

19
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json
View file

@ -1,19 +0,0 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "y": 270, "uvlock": true }
}
]
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockTestifiBucksGreenWall"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

19
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json
View file

@ -1,19 +0,0 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "y": 270, "uvlock": true }
}
]
}

20
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json
View file

@ -1,20 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:half_slab",
"textures": {
"bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall",
"top": "#bottom",
"side": "#bottom"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"meta": {
"0": {},
"1": { "model": "minecraft:upper_slab" }
}
}
}

54
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json
View file

@ -1,54 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall",
"top": "#bottom",
"side": "#bottom"
}
},
"variants": {
"normal": { "model": "minecraft:stairs" },
"inventory": { "model": "minecraft:stairs" },
"facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" },
"facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" },
"facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" },
"facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" },
"facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" },
"facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json
View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockTestifiBucksWhiteWall"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

9
src/main/resources/assets/actuallyadditions/blockstates/blockTinyTorch.json
View file

@ -1,9 +0,0 @@
{
"variants": {
"facing=up": { "model": "actuallyadditions:blockTinyTorch" },
"facing=east": { "model": "actuallyadditions:blockTinyTorchWall" },
"facing=south": { "model": "actuallyadditions:blockTinyTorchWall", "y": 90 },
"facing=west": { "model": "actuallyadditions:blockTinyTorchWall", "y": 180 },
"facing=north": { "model": "actuallyadditions:blockTinyTorchWall", "y": 270 }
}
}

4
src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json → src/main/resources/assets/actuallyadditions/blockstates/block_atomic_reconstructor.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockAtomicReconstructor",
"model": "actuallyadditions:block_atomic_reconstructor",
"textures": {
"particle": "actuallyadditions:blocks/blockAtomicReconstructor",
"particle": "actuallyadditions:blocks/block_atomic_reconstructor",
"down": "#particle",
"south": "#particle",
"east": "#particle",

2
src/main/resources/assets/actuallyadditions/blockstates/blockItemViewer.json → src/main/resources/assets/actuallyadditions/blockstates/block_bio_reactor.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockItemViewer"
"all": "actuallyadditions:blocks/block_bio_reactor"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json → src/main/resources/assets/actuallyadditions/blockstates/block_black_lotus.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cross",
"textures": {
"cross": "actuallyadditions:blocks/blockBlackLotus"
"cross": "actuallyadditions:blocks/block_black_lotus"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockBookletStand.json → src/main/resources/assets/actuallyadditions/blockstates/block_booklet_stand.json
View file

@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockBookletStand",
"model": "actuallyadditions:block_booklet_stand",
"transform": "forge:default-block"
},
"variants": {

6
src/main/resources/assets/actuallyadditions/blockstates/blockBreaker.json → src/main/resources/assets/actuallyadditions/blockstates/block_breaker.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockBreaker",
"particle": "actuallyadditions:blocks/block_breaker",
"down": "#particle",
"up": "actuallyadditions:blocks/blockBreakerTop",
"up": "actuallyadditions:blocks/block_breaker_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockBreakerFront",
"north": "actuallyadditions:blocks/block_breaker_front",
"east": "#particle",
"west": "#particle"
},

18
src/main/resources/assets/actuallyadditions/blockstates/blockCanola.json → src/main/resources/assets/actuallyadditions/blockstates/block_canola.json
View file

@ -3,21 +3,21 @@
"defaults": {
"model": "minecraft:crop",
"textures": {
"crop": "actuallyadditions:blocks/blockCanolaStage1"
"crop": "actuallyadditions:blocks/block_canola_stage_1"
}
},
"variants": {
"normal": [{}],
"inventory": [{}],
"age": {
"0": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage1" } },
"1": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage2" } },
"2": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage2" } },
"3": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage2" } },
"4": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage3" } },
"5": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage3" } },
"6": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage3" } },
"7": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage4" } }
"0": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_1" } },
"1": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_2" } },
"2": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_2" } },
"3": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_2" } },
"4": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_3" } },
"5": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_3" } },
"6": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_3" } },
"7": { "textures": { "crop": "actuallyadditions:blocks/block_canola_stage_4" } }
}
}
}

4
src/main/resources/assets/actuallyadditions/blockstates/blockDisplayStand.json → src/main/resources/assets/actuallyadditions/blockstates/block_canola_press.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockDisplayStand",
"model": "actuallyadditions:block_canola_press",
"textures": {
"particle": "actuallyadditions:blocks/blockGiantChestTop"
"particle": "actuallyadditions:blocks/block_canola_press"
},
"transform": "forge:default-block"
},

20
src/main/resources/assets/actuallyadditions/blockstates/block_chiseled_quartz_slab.json Normal file
View file

@ -0,0 +1,20 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:half_slab",
"textures": {
"bottom": "actuallyadditions:blocks/block_misc_black_quartz_chiseled",
"top": "#bottom",
"side": "#bottom"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"meta": {
"0": {},
"1": { "model": "minecraft:upper_slab" }
}
}
}

54
src/main/resources/assets/actuallyadditions/blockstates/block_chiseled_quartz_stair.json Normal file
View file

@ -0,0 +1,54 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"bottom": "actuallyadditions:blocks/block_misc_black_quartz_chiseled",
"top": "#bottom",
"side": "#bottom"
}
},
"variants": {
"normal": { "model": "minecraft:stairs" },
"inventory": { "model": "minecraft:stairs" },
"facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" },
"facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" },
"facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" },
"facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" },
"facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" },
"facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }
}
}

19
src/main/resources/assets/actuallyadditions/blockstates/block_chiseled_quartz_wall.json Normal file
View file

@ -0,0 +1,19 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:block_chiseled_quartz_wall_post" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:block_chiseled_quartz_wall_side", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:block_chiseled_quartz_wall_side", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:block_chiseled_quartz_wall_side", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:block_chiseled_quartz_wall_side", "y": 270, "uvlock": true }
}
]
}

4
src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json → src/main/resources/assets/actuallyadditions/blockstates/block_coal_generator.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockOilGenerator",
"model": "actuallyadditions:block_coal_generator",
"textures": {
"particle": "actuallyadditions:blocks/blockOilGenerator"
"particle": "actuallyadditions:blocks/block_coal_generator"
},
"transform": "forge:default-block"
},

18
src/main/resources/assets/actuallyadditions/blockstates/blockCoffee.json → src/main/resources/assets/actuallyadditions/blockstates/block_coffee.json
View file

@ -3,21 +3,21 @@
"defaults": {
"model": "minecraft:crop",
"textures": {
"crop": "actuallyadditions:blocks/blockCoffeeStage1"
"crop": "actuallyadditions:blocks/block_coffee_stage_1"
}
},
"variants": {
"normal": [{}],
"inventory": [{}],
"age": {
"0": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage1" } },
"1": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage2" } },
"2": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage2" } },
"3": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage3" } },
"4": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage4" } },
"5": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage4" } },
"6": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage5" } },
"7": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage6" } }
"0": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_1" } },
"1": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_2" } },
"2": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_2" } },
"3": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_3" } },
"4": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_4" } },
"5": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_4" } },
"6": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_5" } },
"7": { "textures": { "crop": "actuallyadditions:blocks/block_coffee_stage_6" } }
}
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json → src/main/resources/assets/actuallyadditions/blockstates/block_coffee_machine.json
View file

@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockCoffeeMachine",
"model": "actuallyadditions:block_coffee_machine",
"transform": "forge:default-block"
},
"variants": {

32
src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json → src/main/resources/assets/actuallyadditions/blockstates/block_colored_lamp.json
View file

@ -8,22 +8,22 @@
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampWhite" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOrange" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampMagenta" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampLightBlue" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampYellow" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampLime" } },
"6": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampPink" } },
"7": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampGray" } },
"8": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampLightGray" } },
"9": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampCyan" } },
"10": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampPurple" } },
"11": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampBlue" } },
"12": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampBrown" } },
"13": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampGreen" } },
"14": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampRed" } },
"15": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampBlack" } }
"0": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_white" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_orange" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_magenta" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_light_blue" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_yellow" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_lime" } },
"6": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_pink" } },
"7": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_gray" } },
"8": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_light_gray" } },
"9": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_cyan" } },
"10": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_purple" } },
"11": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_blue" } },
"12": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_brown" } },
"13": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_green" } },
"14": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_red" } },
"15": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_black" } }
}
}
}

32
src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json → src/main/resources/assets/actuallyadditions/blockstates/block_colored_lamp_on.json
View file

@ -8,22 +8,22 @@
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnWhite" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnOrange" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnMagenta" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnLightBlue" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnYellow" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnLime" } },
"6": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnPink" } },
"7": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnGray" } },
"8": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnLightGray" } },
"9": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnCyan" } },
"10": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnPurple" } },
"11": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnBlue" } },
"12": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnBrown" } },
"13": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnGreen" } },
"14": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnRed" } },
"15": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnBlack" } }
"0": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_white" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_orange" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_magenta" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_light_blue" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_yellow" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_lime" } },
"6": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_pink" } },
"7": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_gray" } },
"8": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_light_gray" } },
"9": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_cyan" } },
"10": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_purple" } },
"11": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_blue" } },
"12": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_brown" } },
"13": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_green" } },
"14": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_red" } },
"15": { "textures" : { "all" : "actuallyadditions:blocks/block_colored_lamp_on_black" } }
}
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockCompost.json → src/main/resources/assets/actuallyadditions/blockstates/block_compost.json
View file

@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockCompost",
"model": "actuallyadditions:block_compost",
"transform": "forge:default-block"
},
"variants": {

12
src/main/resources/assets/actuallyadditions/blockstates/blockCrystal.json → src/main/resources/assets/actuallyadditions/blockstates/block_crystal.json
View file

@ -8,12 +8,12 @@
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalRed" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalBlue" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalLightBlue" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalBlack" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalGreen" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalWhite" } }
"0": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_red" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_blue" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_light_blue" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_black" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_green" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_white" } }
}
}
}

12
src/main/resources/assets/actuallyadditions/blockstates/blockCrystalEmpowered.json → src/main/resources/assets/actuallyadditions/blockstates/block_crystal_empowered.json
View file

@ -8,12 +8,12 @@
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalEmpoweredRed" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalEmpoweredBlue" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalEmpoweredLightBlue" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalEmpoweredBlack" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalEmpoweredGreen" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalEmpoweredWhite" } }
"0": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_empowered_red" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_empowered_blue" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_empowered_light_blue" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_empowered_black" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_empowered_green" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/block_crystal_empowered_white" } }
}
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockDirectionalBreaker.json → src/main/resources/assets/actuallyadditions/blockstates/block_directional_breaker.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockDirectionalBreaker",
"particle": "actuallyadditions:blocks/block_directional_breaker",
"down": "#particle",
"up": "actuallyadditions:blocks/blockDirectionalBreakerTop",
"up": "actuallyadditions:blocks/block_directional_breaker_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockDirectionalBreakerFront",
"north": "actuallyadditions:blocks/block_directional_breaker_front",
"east": "#particle",
"west": "#particle"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_display_stand.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:block_display_stand",
"textures": {
"particle": "actuallyadditions:blocks/block_giant_chest_top"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/block_distributor_item.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_item_distributor"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockPlacer.json → src/main/resources/assets/actuallyadditions/blockstates/block_dropper.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockPlacer",
"particle": "actuallyadditions:blocks/block_dropper",
"down": "#particle",
"up": "actuallyadditions:blocks/blockPlacerTop",
"up": "actuallyadditions:blocks/block_dropper_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockPlacerFront",
"north": "actuallyadditions:blocks/block_dropper_front",
"east": "#particle",
"west": "#particle"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockEmpowerer.json → src/main/resources/assets/actuallyadditions/blockstates/block_empowerer.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockEmpowerer",
"model": "actuallyadditions:block_empowerer",
"textures": {
"particle": "actuallyadditions:blocks/blockEmpowerer"
"particle": "actuallyadditions:blocks/block_empowerer"
},
"transform": "forge:default-block"
},

6
src/main/resources/assets/actuallyadditions/blockstates/blockEnergizer.json → src/main/resources/assets/actuallyadditions/blockstates/block_energizer.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockEnergizerSide",
"bottom": "actuallyadditions:blocks/blockEnergizer",
"top": "actuallyadditions:blocks/blockEnergizerTop"
"side": "actuallyadditions:blocks/block_energizer_side",
"bottom": "actuallyadditions:blocks/block_energizer",
"top": "actuallyadditions:blocks/block_energizer_top"
},
"transform": "forge:default-block"
},

6
src/main/resources/assets/actuallyadditions/blockstates/blockEnervator.json → src/main/resources/assets/actuallyadditions/blockstates/block_enervator.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockEnervatorSide",
"bottom": "actuallyadditions:blocks/blockEnervator",
"top": "actuallyadditions:blocks/blockEnervatorTop"
"side": "actuallyadditions:blocks/block_enervator_side",
"bottom": "actuallyadditions:blocks/block_enervator",
"top": "actuallyadditions:blocks/block_enervator_top"
},
"transform": "forge:default-block"
},

6
src/main/resources/assets/actuallyadditions/blockstates/blockFarmer.json → src/main/resources/assets/actuallyadditions/blockstates/block_farmer.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFarmer",
"particle": "actuallyadditions:blocks/block_farmer",
"down": "#particle",
"up": "actuallyadditions:blocks/blockFarmerTop",
"up": "actuallyadditions:blocks/block_farmer_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockFarmerFront",
"north": "actuallyadditions:blocks/block_farmer_front",
"east": "#particle",
"west": "#particle"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json → src/main/resources/assets/actuallyadditions/blockstates/block_feeder.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockFeeder",
"side": "actuallyadditions:blocks/block_feeder",
"bottom": "#top",
"top": "actuallyadditions:blocks/blockFeederTop"
"top": "actuallyadditions:blocks/block_feeder_top"
},
"transform": "forge:default-block"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_fermenting_barrel.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:block_fermenting_barrel",
"textures": {
"particle": "actuallyadditions:blocks/block_fermenting_barrel"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

4
src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json → src/main/resources/assets/actuallyadditions/blockstates/block_firework_box.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockFireworkBox",
"side": "actuallyadditions:blocks/block_firework_box",
"bottom": "#side",
"top": "actuallyadditions:blocks/blockFireworkBoxTop"
"top": "actuallyadditions:blocks/block_firework_box_top"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockFishingNet.json → src/main/resources/assets/actuallyadditions/blockstates/block_fishing_net.json
View file

@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockFishingNet",
"model": "actuallyadditions:block_fishing_net",
"transform": "forge:default-block"
},
"variants": {

18
src/main/resources/assets/actuallyadditions/blockstates/blockFlax.json → src/main/resources/assets/actuallyadditions/blockstates/block_flax.json
View file

@ -3,21 +3,21 @@
"defaults": {
"model": "minecraft:crop",
"textures": {
"crop": "actuallyadditions:blocks/blockFlaxStage1"
"crop": "actuallyadditions:blocks/block_flax_stage_1"
}
},
"variants": {
"normal": [{}],
"inventory": [{}],
"age": {
"0": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage1" } },
"1": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage2" } },
"2": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage2" } },
"3": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage3" } },
"4": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage4" } },
"5": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage4" } },
"6": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage5" } },
"7": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage6" } }
"0": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_1" } },
"1": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_2" } },
"2": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_2" } },
"3": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_3" } },
"4": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_4" } },
"5": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_4" } },
"6": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_5" } },
"7": { "textures": { "crop": "actuallyadditions:blocks/block_flax_stage_6" } }
}
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockFluidPlacer.json → src/main/resources/assets/actuallyadditions/blockstates/block_fluid_collector.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFluidPlacer",
"particle": "actuallyadditions:blocks/block_fluid_collector",
"down": "#particle",
"up": "actuallyadditions:blocks/blockFluidPlacerTop",
"up": "actuallyadditions:blocks/block_fluid_collector_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockFluidPlacerFront",
"north": "actuallyadditions:blocks/block_fluid_collector_front",
"east": "#particle",
"west": "#particle"
},

6
src/main/resources/assets/actuallyadditions/blockstates/blockFluidCollector.json → src/main/resources/assets/actuallyadditions/blockstates/block_fluid_placer.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFluidCollector",
"particle": "actuallyadditions:blocks/block_fluid_placer",
"down": "#particle",
"up": "actuallyadditions:blocks/blockFluidCollectorTop",
"up": "actuallyadditions:blocks/block_fluid_placer_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockFluidCollectorFront",
"north": "actuallyadditions:blocks/block_fluid_placer_front",
"east": "#particle",
"west": "#particle"
},

14
src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceDouble.json → src/main/resources/assets/actuallyadditions/blockstates/block_furnace_double.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockFurnaceDouble",
"particle": "actuallyadditions:blocks/block_furnace_double",
"down": "#particle",
"up": "actuallyadditions:blocks/blockFurnaceDoubleTop",
"up": "actuallyadditions:blocks/block_furnace_double_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockFurnaceDoubleFront",
"north": "actuallyadditions:blocks/block_furnace_double_front",
"east": "#particle",
"west": "#particle"
},
@ -21,10 +21,10 @@
"1": { "y" : 180 },
"2": { "y" : 270 },
"3": { "y" : 90 },
"4": { "y" : 0, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } },
"5": { "y" : 180, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } },
"6": { "y" : 270, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } },
"7": { "y" : 90, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } }
"4": { "y" : 0, "textures": { "north": "actuallyadditions:blocks/block_furnace_double_on" } },
"5": { "y" : 180, "textures": { "north": "actuallyadditions:blocks/block_furnace_double_on" } },
"6": { "y" : 270, "textures": { "north": "actuallyadditions:blocks/block_furnace_double_on" } },
"7": { "y" : 90, "textures": { "north": "actuallyadditions:blocks/block_furnace_double_on" } }
}
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceSolar.json → src/main/resources/assets/actuallyadditions/blockstates/block_furnace_solar.json
View file

@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockFurnaceSolar",
"model": "actuallyadditions:block_furnace_solar",
"transform": "forge:default-block"
},
"variants": {

4
src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json → src/main/resources/assets/actuallyadditions/blockstates/block_giant_chest.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockCanolaPress",
"model": "actuallyadditions:block_giant_chest",
"textures": {
"particle": "actuallyadditions:blocks/blockCanolaPress"
"particle": "actuallyadditions:blocks/block_giant_chest"
},
"transform": "forge:default-block"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_giant_chest_large.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:block_giant_chest_large",
"textures": {
"particle": "actuallyadditions:blocks/block_giant_chest"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/block_giant_chest_medium.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:block_giant_chest_medium",
"textures": {
"particle": "actuallyadditions:blocks/block_giant_chest"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

14
src/main/resources/assets/actuallyadditions/blockstates/block_greenhouse_glass.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_greenhouse_glass"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

8
src/main/resources/assets/actuallyadditions/blockstates/blockGrinder.json → src/main/resources/assets/actuallyadditions/blockstates/block_grinder.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockGrinder",
"bottom": "actuallyadditions:blocks/blockGrinderBottom",
"top": "actuallyadditions:blocks/blockGrinderTop"
"side": "actuallyadditions:blocks/block_grinder",
"bottom": "actuallyadditions:blocks/block_grinder_bottom",
"top": "actuallyadditions:blocks/block_grinder_top"
},
"transform": "forge:default-block"
},
@ -14,7 +14,7 @@
"inventory": [{}],
"meta": {
"0": {},
"1": { "textures": { "top": "actuallyadditions:blocks/blockGrinderOn" } }
"1": { "textures": { "top": "actuallyadditions:blocks/block_grinder_on" } }
}
}
}

8
src/main/resources/assets/actuallyadditions/blockstates/blockGrinderDouble.json → src/main/resources/assets/actuallyadditions/blockstates/block_grinder_double.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockGrinderDouble",
"bottom": "actuallyadditions:blocks/blockGrinderBottom",
"top": "actuallyadditions:blocks/blockGrinderTop"
"side": "actuallyadditions:blocks/block_grinder_double",
"bottom": "actuallyadditions:blocks/block_grinder_bottom",
"top": "actuallyadditions:blocks/block_grinder_top"
},
"transform": "forge:default-block"
},
@ -14,7 +14,7 @@
"inventory": [{}],
"meta": {
"0": {},
"1": { "textures": { "top": "actuallyadditions:blocks/blockGrinderOn" } }
"1": { "textures": { "top": "actuallyadditions:blocks/block_grinder_on" } }
}
}
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockHeatCollector.json → src/main/resources/assets/actuallyadditions/blockstates/block_heat_collector.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockHeatCollectorSide",
"bottom": "actuallyadditions:blocks/blockHeatCollectorBottom",
"top": "actuallyadditions:blocks/blockHeatCollectorTop"
"side": "actuallyadditions:blocks/block_heat_collector_side",
"bottom": "actuallyadditions:blocks/block_heat_collector_bottom",
"top": "actuallyadditions:blocks/block_heat_collector_top"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json → src/main/resources/assets/actuallyadditions/blockstates/block_inputter.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockInputter"
"all": "actuallyadditions:blocks/block_inputter"
},
"transform": "forge:default-block"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_inputter_advanced.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_inputter_advanced"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

16
src/main/resources/assets/actuallyadditions/blockstates/block_item_repairer.json Normal file
View file

@ -0,0 +1,16 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/block_item_repairer",
"bottom": "actuallyadditions:blocks/block_item_repairer_bottom",
"top": "actuallyadditions:blocks/block_item_repairer_top"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockBioReactor.json → src/main/resources/assets/actuallyadditions/blockstates/block_item_viewer.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockBioReactor"
"all": "actuallyadditions:blocks/block_item_viewer"
},
"transform": "forge:default-block"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json → src/main/resources/assets/actuallyadditions/blockstates/block_lamp_powerer.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockLampPowerer",
"particle": "actuallyadditions:blocks/block_lamp_powerer",
"down": "#particle",
"up": "#particle",
"south": "#particle",
"north": "actuallyadditions:blocks/blockLampPowererFront",
"north": "actuallyadditions:blocks/block_lamp_powerer_front",
"east": "#particle",
"west": "#particle"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItem.json → src/main/resources/assets/actuallyadditions/blockstates/block_laser_relay.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockLaserRelay",
"model": "actuallyadditions:block_laser_relay",
"textures": {
"particle": "actuallyadditions:blocks/models/modelLaserRelayItem"
"particle": "actuallyadditions:blocks/models/model_laser_relay"
},
"transform": "forge:default-block"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json → src/main/resources/assets/actuallyadditions/blockstates/block_laser_relay_advanced.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockLaserRelay",
"model": "actuallyadditions:block_laser_relay",
"textures": {
"particle": "actuallyadditions:blocks/models/modelLaserRelay"
"particle": "actuallyadditions:blocks/models/model_laser_relay_advanced"
},
"transform": "forge:default-block"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayAdvanced.json → src/main/resources/assets/actuallyadditions/blockstates/block_laser_relay_extreme.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockLaserRelay",
"model": "actuallyadditions:block_laser_relay",
"textures": {
"particle": "actuallyadditions:blocks/models/modelLaserRelayAdvanced"
"particle": "actuallyadditions:blocks/models/model_laser_relay_extreme"
},
"transform": "forge:default-block"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayFluids.json → src/main/resources/assets/actuallyadditions/blockstates/block_laser_relay_fluids.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockLaserRelay",
"model": "actuallyadditions:block_laser_relay",
"textures": {
"particle": "actuallyadditions:blocks/models/modelLaserRelayFluids"
"particle": "actuallyadditions:blocks/models/model_laser_relay_fluids"
},
"transform": "forge:default-block"
},

4
src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayExtreme.json → src/main/resources/assets/actuallyadditions/blockstates/block_laser_relay_item.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockLaserRelay",
"model": "actuallyadditions:block_laser_relay",
"textures": {
"particle": "actuallyadditions:blocks/models/modelLaserRelayExtreme"
"particle": "actuallyadditions:blocks/models/model_laser_relay_item"
},
"transform": "forge:default-block"
},

22
src/main/resources/assets/actuallyadditions/blockstates/block_laser_relay_item_whitelist.json Normal file
View file

@ -0,0 +1,22 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:block_laser_relay",
"textures": {
"particle": "actuallyadditions:blocks/models/model_laser_relay_item_whitelist"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "x": 180 },
"1": {},
"2": { "x": 90 },
"3": { "x": 270 },
"4": { "x": 90, "y": 270 },
"5": { "x": 270, "y": 270 }
}
}
}

4
src/main/resources/assets/actuallyadditions/blockstates/blockLavaFactoryController.json → src/main/resources/assets/actuallyadditions/blockstates/block_lava_factory_controller.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockLavaFactoryController",
"side": "actuallyadditions:blocks/block_lava_factory_controller",
"bottom": "#side",
"top": "actuallyadditions:blocks/blockLavaFactoryControllerTop"
"top": "actuallyadditions:blocks/block_lava_factory_controller_top"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockGreenhouseGlass.json → src/main/resources/assets/actuallyadditions/blockstates/block_leaf_generator.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockGreenhouseGlass"
"all": "actuallyadditions:blocks/block_leaf_generator"
},
"transform": "forge:default-block"
},

6
src/main/resources/assets/actuallyadditions/blockstates/blockMiner.json → src/main/resources/assets/actuallyadditions/blockstates/block_miner.json
View file

@ -3,9 +3,9 @@
"defaults": {
"model": "minecraft:cube_bottom_top",
"textures": {
"side": "actuallyadditions:blocks/blockMiner",
"bottom": "actuallyadditions:blocks/blockMinerFront",
"top": "actuallyadditions:blocks/blockMinerTop"
"side": "actuallyadditions:blocks/block_miner",
"bottom": "actuallyadditions:blocks/block_miner_front",
"top": "actuallyadditions:blocks/block_miner_top"
},
"transform": "forge:default-block"
},

20
src/main/resources/assets/actuallyadditions/blockstates/blockMisc.json → src/main/resources/assets/actuallyadditions/blockstates/block_misc.json
View file

@ -8,16 +8,16 @@
"normal": [{}],
"inventory": [{}],
"meta": {
"0": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscBlackQuartzPillar" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscBlackQuartzChiseled" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscBlackQuartz" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscOreBlackQuartz" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscWoodCasing" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscCharcoal" } },
"6": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscEnderpearl" } },
"7": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscLavaFactoryCase" } },
"8": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscEnderCasing" } },
"9": { "textures" : { "all" : "actuallyadditions:blocks/blockMiscIronCasing" } }
"0": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_black_quartz_pillar" } },
"1": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_black_quartz_chiseled" } },
"2": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_black_quartz" } },
"3": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_ore_black_quartz" } },
"4": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_wood_casing" } },
"5": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_charcoal" } },
"6": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_enderpearl" } },
"7": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_lava_factory_case" } },
"8": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_ender_casing" } },
"9": { "textures" : { "all" : "actuallyadditions:blocks/block_misc_iron_casing" } }
}
}
}

4
src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json → src/main/resources/assets/actuallyadditions/blockstates/block_oil_generator.json
View file

@ -1,9 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockCoalGenerator",
"model": "actuallyadditions:block_oil_generator",
"textures": {
"particle": "actuallyadditions:blocks/blockCoalGenerator"
"particle": "actuallyadditions:blocks/block_oil_generator"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBooster.json → src/main/resources/assets/actuallyadditions/blockstates/block_phantom_booster.json
View file

@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "actuallyadditions:blockPhantomBooster",
"model": "actuallyadditions:block_phantom_booster",
"transform": "forge:default-block"
},
"variants": {

14
src/main/resources/assets/actuallyadditions/blockstates/block_phantom_breaker.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_phantom_breaker"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomRedstoneface.json → src/main/resources/assets/actuallyadditions/blockstates/block_phantom_energyface.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPhantomRedstoneface"
"all": "actuallyadditions:blocks/block_phantom_energyface"
},
"transform": "forge:default-block"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_phantom_liquiface.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_phantom_liquiface"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockDistributorItem.json → src/main/resources/assets/actuallyadditions/blockstates/block_phantom_placer.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockItemDistributor"
"all": "actuallyadditions:blocks/block_phantom_placer"
},
"transform": "forge:default-block"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_phantom_redstoneface.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_phantom_redstoneface"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

2
src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json → src/main/resources/assets/actuallyadditions/blockstates/block_phantomface.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/blockPhantomface"
"all": "actuallyadditions:blocks/block_phantomface"
},
"transform": "forge:default-block"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzSlab.json → src/main/resources/assets/actuallyadditions/blockstates/block_pillar_quartz_slab.json
View file

@ -3,7 +3,7 @@
"defaults": {
"model": "minecraft:half_slab",
"textures": {
"bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
"bottom": "actuallyadditions:blocks/block_misc_black_quartz_pillar",
"top": "#bottom",
"side": "#bottom"
},

2
src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzStair.json → src/main/resources/assets/actuallyadditions/blockstates/block_pillar_quartz_stair.json
View file

@ -2,7 +2,7 @@
"forge_marker": 1,
"defaults": {
"textures": {
"bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
"bottom": "actuallyadditions:blocks/block_misc_black_quartz_pillar",
"top": "#bottom",
"side": "#bottom"
}

19
src/main/resources/assets/actuallyadditions/blockstates/block_pillar_quartz_wall.json Normal file
View file

@ -0,0 +1,19 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "actuallyadditions:block_pillar_quartz_wall_post" }
},
{ "when": { "north": "true" },
"apply": { "model": "actuallyadditions:block_pillar_quartz_wall_side", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "actuallyadditions:block_pillar_quartz_wall_side", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "actuallyadditions:block_pillar_quartz_wall_side", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "actuallyadditions:block_pillar_quartz_wall_side", "y": 270, "uvlock": true }
}
]
}

6
src/main/resources/assets/actuallyadditions/blockstates/blockDropper.json → src/main/resources/assets/actuallyadditions/blockstates/block_placer.json
View file

@ -3,11 +3,11 @@
"defaults": {
"model": "minecraft:cube",
"textures": {
"particle": "actuallyadditions:blocks/blockDropper",
"particle": "actuallyadditions:blocks/block_placer",
"down": "#particle",
"up": "actuallyadditions:blocks/blockDropperTop",
"up": "actuallyadditions:blocks/block_placer_top",
"south": "#particle",
"north": "actuallyadditions:blocks/blockDropperFront",
"north": "actuallyadditions:blocks/block_placer_front",
"east": "#particle",
"west": "#particle"
},

14
src/main/resources/assets/actuallyadditions/blockstates/block_player_interface.json Normal file
View file

@ -0,0 +1,14 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "actuallyadditions:blocks/block_player_interface"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

Some files were not shown because too many files have changed in this diff Show more