Models for generators
This commit is contained in:
parent
9f39da44b1
commit
a1fc56042a
26 changed files with 215 additions and 199 deletions
|
@ -1,3 +1,27 @@
|
|||
/*
|
||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) 2018 TechReborn
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.api.recipe.recipes;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
|
@ -12,7 +36,7 @@ public class BlastFurnaceRecipe extends Recipe {
|
|||
|
||||
int heat;
|
||||
|
||||
public BlastFurnaceRecipe(RecipeType type, ResourceLocation name) {
|
||||
public BlastFurnaceRecipe(RecipeType<?> type, ResourceLocation name) {
|
||||
super(type, name);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,3 +1,27 @@
|
|||
/*
|
||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) 2018 TechReborn
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.api.recipe.recipes;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -12,7 +36,7 @@ public class IndustrialGrinderRecipe extends Recipe {
|
|||
//TODO 1.14 fluids
|
||||
FluidStack fluidStack = null;
|
||||
|
||||
public IndustrialGrinderRecipe(RecipeType type, ResourceLocation name) {
|
||||
public IndustrialGrinderRecipe(RecipeType<?> type, ResourceLocation name) {
|
||||
super(type, name);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,3 +1,27 @@
|
|||
/*
|
||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) 2018 TechReborn
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.api.recipe.recipes;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -12,7 +36,7 @@ public class IndustrialSawmillRecipe extends Recipe {
|
|||
//TODO 1.14 fluids
|
||||
FluidStack fluidStack = null;
|
||||
|
||||
public IndustrialSawmillRecipe(RecipeType type, ResourceLocation name) {
|
||||
public IndustrialSawmillRecipe(RecipeType<?> type, ResourceLocation name) {
|
||||
super(type, name);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north,active=false": { "model": "techreborn:block/machines/generators/diesel_generator" },
|
||||
"facing=south,active=false": { "model": "techreborn:block/machines/generators/diesel_generator", "y": 180 },
|
||||
"facing=west,active=false": { "model": "techreborn:block/machines/generators/diesel_generator", "y": 270 },
|
||||
"facing=east,active=false": { "model": "techreborn:block/machines/generators/diesel_generator", "y": 90 },
|
||||
"facing=north,active=true": { "model": "techreborn:block/machines/generators/diesel_generator_on" },
|
||||
"facing=south,active=true": { "model": "techreborn:block/machines/generators/diesel_generator_on", "y": 180 },
|
||||
"facing=west,active=true": { "model": "techreborn:block/machines/generators/diesel_generator_on", "y": 270 },
|
||||
"facing=east,active=true": { "model": "techreborn:block/machines/generators/diesel_generator_on", "y": 90 }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north,active=false": { "model": "techreborn:block/machines/generators/dragon_egg_syphon" },
|
||||
"facing=south,active=false": { "model": "techreborn:block/machines/generators/dragon_egg_syphon", "y": 180 },
|
||||
"facing=west,active=false": { "model": "techreborn:block/machines/generators/dragon_egg_syphon", "y": 270 },
|
||||
"facing=east,active=false": { "model": "techreborn:block/machines/generators/dragon_egg_syphon", "y": 90 },
|
||||
"facing=north,active=true": { "model": "techreborn:block/machines/generators/dragon_egg_syphon_on" },
|
||||
"facing=south,active=true": { "model": "techreborn:block/machines/generators/dragon_egg_syphon_on", "y": 180 },
|
||||
"facing=west,active=true": { "model": "techreborn:block/machines/generators/dragon_egg_syphon_on", "y": 270 },
|
||||
"facing=east,active=true": { "model": "techreborn:block/machines/generators/dragon_egg_syphon_on", "y": 90 }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north,active=false": { "model": "techreborn:block/machines/generators/gas_turbine" },
|
||||
"facing=south,active=false": { "model": "techreborn:block/machines/generators/gas_turbine", "y": 180 },
|
||||
"facing=west,active=false": { "model": "techreborn:block/machines/generators/gas_turbine", "y": 270 },
|
||||
"facing=east,active=false": { "model": "techreborn:block/machines/generators/gas_turbine", "y": 90 },
|
||||
"facing=north,active=true": { "model": "techreborn:block/machines/generators/gas_turbine_on" },
|
||||
"facing=south,active=true": { "model": "techreborn:block/machines/generators/gas_turbine_on", "y": 180 },
|
||||
"facing=west,active=true": { "model": "techreborn:block/machines/generators/gas_turbine_on", "y": 270 },
|
||||
"facing=east,active=true": { "model": "techreborn:block/machines/generators/gas_turbine_on", "y": 90 }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/machines/generators/lightning_rod" }
|
||||
}
|
||||
}
|
|
@ -1,48 +0,0 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "cube_bottom_top",
|
||||
"textures": {
|
||||
"particle": "techreborn:blocks/machines/generators/diesel_generator_side_off",
|
||||
"down": "techreborn:blocks/machines/generators/generator_bottom"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "cube_bottom_top",
|
||||
"textures": {
|
||||
"side": "techreborn:blocks/machines/generators/diesel_generator_side_off",
|
||||
"top": "techreborn:blocks/machines/generators/diesel_generator_top_off"
|
||||
}
|
||||
},
|
||||
"facing": {
|
||||
"north": {
|
||||
},
|
||||
"east": {
|
||||
"y": 90
|
||||
},
|
||||
"south": {
|
||||
"y": 180
|
||||
},
|
||||
"west": {
|
||||
"y": 270
|
||||
}
|
||||
},
|
||||
"active": {
|
||||
"true": {
|
||||
"textures": {
|
||||
"side": "techreborn:blocks/machines/generators/diesel_generator_side_on",
|
||||
"top": "techreborn:blocks/machines/generators/diesel_generator_top_on"
|
||||
}
|
||||
},
|
||||
"false": {
|
||||
"textures": {
|
||||
"side": "techreborn:blocks/machines/generators/diesel_generator_side_off",
|
||||
"top": "techreborn:blocks/machines/generators/diesel_generator_top_off"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,47 +0,0 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "cube_bottom_top",
|
||||
"textures": {
|
||||
"particle": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off",
|
||||
"top": "techreborn:blocks/machines/generators/dragon_egg_syphon_top",
|
||||
"down": "techreborn:blocks/machines/generators/generator_bottom"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "cube_bottom_top",
|
||||
"textures": {
|
||||
"side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off"
|
||||
}
|
||||
},
|
||||
"facing": {
|
||||
"north": {
|
||||
|
||||
},
|
||||
"east": {
|
||||
"y": 90
|
||||
},
|
||||
"south": {
|
||||
"y": 180
|
||||
},
|
||||
"west": {
|
||||
"y": 270
|
||||
}
|
||||
},
|
||||
"active": {
|
||||
"true": {
|
||||
"textures": {
|
||||
"side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_on"
|
||||
}
|
||||
},
|
||||
"false": {
|
||||
"textures": {
|
||||
"side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,51 +0,0 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "cube_bottom_top",
|
||||
"textures": {
|
||||
"particle": "techreborn:blocks/machines/generators/gas_turbine_top_off",
|
||||
"down": "techreborn:blocks/machines/generators/generator_bottom",
|
||||
"side": "techreborn:blocks/machines/generators/generator_side"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"transform": "forge:default-block",
|
||||
"textures": {
|
||||
"top": "techreborn:blocks/machines/generators/gas_turbine_top_off"
|
||||
}
|
||||
},
|
||||
"facing": {
|
||||
"north": {
|
||||
},
|
||||
"east": {
|
||||
"y": 90
|
||||
},
|
||||
"south": {
|
||||
"y": 180
|
||||
},
|
||||
"west": {
|
||||
"y": 270
|
||||
}
|
||||
},
|
||||
"active": {
|
||||
"true": {
|
||||
"textures": {
|
||||
"top": "techreborn:blocks/machines/generators/gas_turbine_top_on"
|
||||
}
|
||||
},
|
||||
"false": {
|
||||
"textures": {
|
||||
"top": "techreborn:blocks/machines/generators/gas_turbine_top_off"
|
||||
}
|
||||
}
|
||||
},
|
||||
"inventory": {
|
||||
"model": "cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:blocks/machines/generators/gas_turbine_top_off"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,50 +0,0 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "orientable",
|
||||
"textures": {
|
||||
"particle": "techreborn:blocks/machines/generators/lightning_rod_side",
|
||||
"top": "techreborn:blocks/machines/generators/lightning_rod_top",
|
||||
"side": "techreborn:blocks/machines/generators/lightning_rod_side",
|
||||
"front": "techreborn:blocks/machines/generators/lightning_rod_side",
|
||||
"down": "techreborn:blocks/machines/generators/generator_bottom"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"transform": "forge:default-block",
|
||||
"model": "orientable",
|
||||
"textures": {
|
||||
|
||||
}
|
||||
},
|
||||
"facing": {
|
||||
"north": {
|
||||
|
||||
},
|
||||
"east": {
|
||||
"y": 90
|
||||
},
|
||||
"south": {
|
||||
"y": 180
|
||||
},
|
||||
"west": {
|
||||
"y": 270
|
||||
}
|
||||
},
|
||||
"active": {
|
||||
"true": {
|
||||
"textures": {
|
||||
|
||||
}
|
||||
},
|
||||
"false": {
|
||||
"textures": {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber" },
|
||||
"facing=south,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber", "y": 180 },
|
||||
"facing=west,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber", "y": 270 },
|
||||
"facing=east,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber", "y": 90 },
|
||||
"facing=north,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on" },
|
||||
"facing=south,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on", "y": 180 },
|
||||
"facing=west,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on", "y": 270 },
|
||||
"facing=east,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on", "y": 90 }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/diesel_generator_top_off",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/diesel_generator_side_off"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/diesel_generator_top_on",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/diesel_generator_side_on"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/dragon_egg_syphon_top",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/dragon_egg_syphon_side_off"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/dragon_egg_syphon_top",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/dragon_egg_syphon_side_on"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/gas_turbine_top_off",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/generator_side_off"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/gas_turbine_top_on",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/generator_side_on"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/lightning_rod_top",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/lightning_rod_side"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/magic_energy_absorber_top_off",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/magic_energy_absorber_side_off"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"top": "techreborn:block/machines/generators/magic_energy_absorber_top_on",
|
||||
"bottom": "techreborn:block/machines/generators/generator_bottom",
|
||||
"side": "techreborn:block/machines/generators/magic_energy_absorber_side_on"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "techreborn:block/machines/generators/diesel_generator"
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "techreborn:block/machines/generators/dragon_egg_syphon"
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "techreborn:block/machines/generators/gas_turbine"
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "techreborn:block/machines/generators/lightning_rod"
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "techreborn:block/machines/generators/magic_energy_absorber"
|
||||
}
|
Loading…
Add table
Reference in a new issue