tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

General cleanup

Browse source
This commit is contained in:
malte0811 2018-05-26 18:46:40 +02:00
parent b3fefaa078
commit b65cdc6fbe
19 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -82,7 +82,7 @@ dependencies {
jar {
from 'LICENSE'
manifest {
attributes 'Maven-Artifact': group+':'+archivesBaseName+':'+version
}
}

11
src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalMB.java
View file

@ -22,7 +22,10 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import javax.annotation.Nonnull;
@ -33,10 +36,14 @@ public class BlockMechanicalMB extends BlockIWMultiblock implements IMetaEnum {
public static final String NAME = "mech_mb";
public BlockMechanicalMB() {
super(Material.IRON, NAME);
}
@Override
@Override
public void getSubBlocks(CreativeTabs itemIn, NonNullList<ItemStack> items) {
//NOP
}
@Override
protected IProperty[] getProperties() {
return new IProperty[] {
IEProperties.FACING_HORIZONTAL, TYPE

1
src/main/resources/assets/industrialwires/blockstates/control_panel.json
View file

@ -103,6 +103,7 @@
"inventory,type=top": {
"model":"industrialwires:block/panel_creator.obj"//Doesn't matter, this will be overridden in code
},
"inventory,type=single_comp": [{}],
"inventory,type=unfinished": {
"model": "industrialwires:block/panel_creator.obj"
//Doesn't matter, this will be overridden in code

12
src/main/resources/assets/industrialwires/blockstates/mech_mb.json
View file

@ -11,6 +11,18 @@
"model": "builtin/generated"
},
"variants": {
"inventory,type=no_model": [{}],
"inventory,type=end": [{}],
"inventory,type=other_end": [{}],
"inventory,type=flywheel": [{}],
"inventory,type=coil_1_phase": [{}],
"inventory,type=shaft_commutator": [{}],
"inventory,type=shaft_1_phase": [{}],
"inventory,type=coil_4_phase": [{}],
"inventory,type=shaft_commutator_4": [{}],
"inventory,type=shaft_4_phase": [{}],
"inventory,type=speedometer": [{}],
"inventory,type=shaft_basic": [{}],
"type": {
"no_model": {
},

1
src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj
View file

@ -143,7 +143,6 @@ vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 6/11/3 5/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/commutator4.obj
View file

@ -536,7 +536,6 @@ vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
vn 0.0000 0.0000 1.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 16/7/2 7/8/2
f 95/9/3 8/10/3 6/11/3 96/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj
View file

@ -75,7 +75,6 @@ vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 0.0000 1.0000
usemtl None
s off
f 3/1/1 4/2/1 6/3/1 5/4/1
f 5/5/2 6/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 10/11/3 9/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj
View file

@ -75,7 +75,6 @@ vn -1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 0.0000 -1.0000
usemtl None
s off
f 3/1/1 4/2/1 6/3/1 5/4/1
f 5/5/2 6/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 10/11/3 9/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/flywheel.obj
View file

@ -136,7 +136,6 @@ vn -0.7071 -0.7071 -0.0000
vn -0.0000 0.0000 -1.0000
vn 0.0000 0.0000 1.0000
usemtl Shaft
s off
f 29/1/1 27/2/1 28/3/1 30/4/1
f 19/5/2 17/6/2 18/7/2 20/8/2
f 21/9/3 19/10/3 20/11/3 22/12/3

17
src/main/resources/assets/industrialwires/models/block/mech_mb/four_coil.obj
View file

@ -432,7 +432,6 @@ vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
usemtl None
s off
f 41/1/1 39/2/1 40/3/1 42/4/1
f 33/5/2 31/6/2 32/7/2 34/8/2
f 35/9/3 33/10/3 34/11/3 36/12/3
@ -521,18 +520,4 @@ f 132/262/7 138/263/7 149/230/7 140/260/7
f 138/263/7 128/264/7 137/231/7 149/230/7
f 137/265/8 150/226/8 136/229/8 129/266/8
f 128/267/8 134/268/8 150/226/8 137/265/8
f 134/268/8 126/269/8 135/227/8 150/226/8
l 2 4
l 3 1
l 6 8
l 7 5
l 10 12
l 11 9
l 14 16
l 15 13
l 18 20
l 19 17
l 22 24
l 23 21
l 26 28
l 27 25
f 134/268/8 126/269/8 135/227/8 150/226/8

1
src/main/resources/assets/industrialwires/models/block/mech_mb/four_electrodes.obj
View file

@ -225,7 +225,6 @@ vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 6/11/3 5/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/mag_ring.obj
View file

@ -151,7 +151,6 @@ vn -1.0000 0.0000 -0.0000
vn -0.0000 1.0000 0.0000
vn -0.0000 -0.0000 -1.0000
usemtl Material.002
s off
f 5/1/1 15/2/1 16/3/1 6/4/1
f 9/5/2 13/6/2 14/7/2 10/8/2
f 3/9/3 1/10/3 2/11/3 4/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj
View file

@ -59,7 +59,6 @@ vn 0.7071 0.7071 -0.0000
vn 0.0000 1.0000 0.0000
vn -0.7071 0.7071 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 6/7/2 5/8/2
f 5/9/3 6/10/3 8/11/3 7/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj
View file

@ -55,7 +55,6 @@ vn 0.7071 0.7071 -0.0000
vn 0.0000 1.0000 0.0000
vn -0.7071 0.7071 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 6/7/2 5/8/2
f 5/8/3 6/7/3 8/9/3 7/10/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj
View file

@ -59,7 +59,6 @@ vn 0.7071 0.7071 -0.0000
vn 0.0000 1.0000 0.0000
vn -0.7071 0.7071 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 6/7/2 5/8/2
f 5/9/3 6/10/3 8/11/3 7/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj
View file

@ -59,7 +59,6 @@ vn 0.7071 0.7071 -0.0000
vn 0.0000 1.0000 0.0000
vn -0.7071 0.7071 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 6/7/2 5/8/2
f 5/9/3 6/10/3 8/11/3 7/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/single_coil.obj
View file

@ -73,7 +73,6 @@ vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 6/11/3 5/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/speedometer.obj
View file

@ -70,7 +70,6 @@ vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 6/11/3 5/12/3

1
src/main/resources/assets/industrialwires/models/block/mech_mb/two_electrodes.obj
View file

@ -92,7 +92,6 @@ vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl None
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/9/3 8/10/3 6/11/3 5/12/3