diff --git a/overrides/resources/contenttweaker/lang/en_us.lang b/overrides/resources/contenttweaker/lang/en_us.lang index 3da86c6..81116e5 100644 --- a/overrides/resources/contenttweaker/lang/en_us.lang +++ b/overrides/resources/contenttweaker/lang/en_us.lang @@ -372,7 +372,6 @@ item.contenttweaker.ultradensehydrogen.name=Ultra Dense Hydrogen tile.contenttweaker.densemagma.name=Dense Magma Block tile.contenttweaker.microverse_casing.name=Microverse Projector Casing -tile.contenttweaker.microverse_vent.name=Microverse Projector Vent item.contenttweaker.eightsmore.name=EightS'more OctoS'mingot item.contenttweaker.sixteensmore.name=SixteenS'more HexadecaS'mingot diff --git a/overrides/resources/contenttweaker/models/block/microverse_vent.json b/overrides/resources/contenttweaker/models/block/microverse_vent.json deleted file mode 100644 index bd463b7..0000000 --- a/overrides/resources/contenttweaker/models/block/microverse_vent.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "contenttweaker:blocks/microverse_vent" - } -} diff --git a/overrides/resources/contenttweaker/textures/blocks/microverse_vent.png b/overrides/resources/contenttweaker/textures/blocks/microverse_vent.png deleted file mode 100644 index eac752b..0000000 Binary files a/overrides/resources/contenttweaker/textures/blocks/microverse_vent.png and /dev/null differ diff --git a/overrides/scripts/ContentTweaker.zs b/overrides/scripts/ContentTweaker.zs index 85043a6..7ca8401 100644 --- a/overrides/scripts/ContentTweaker.zs +++ b/overrides/scripts/ContentTweaker.zs @@ -495,8 +495,9 @@ ultradensehydrogen.register(); var microverse_casing = VanillaFactory.createBlock("microverse_casing", ); microverse_casing.register(); -var microverse_vent = VanillaFactory.createBlock("microverse_vent", ); -microverse_vent.register(); +// Vents are useless... +// var microverse_vent = VanillaFactory.createBlock("microverse_vent", ); +// microverse_vent.register(); //Smores diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index b2a2757..b17f0d7 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -26,14 +26,13 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") .withPattern(function(controller as IControllerTile) as IBlockPattern { return FactoryBlockPattern.start() .aisle("CCC", "CVC", "CCC") - .aisle("CCC", "GDG", "CMC") + .aisle("CCC", "GDG", "CCC") .aisle("CSC", "CGC", "CCC") .where('S', controller.self()) .where('G', ) .where('V', ) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, false)) - .where('M', controller.autoAbilities(false, false, false, false, false, false, true)) // same as CTPredicate.abilities() + .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -42,7 +41,7 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") .maxInputs(4) .minOutputs(1) .maxOutputs(16) - .maxFluidInputs(2) + .maxFluidInputs(1) //.setProgressBar(ROCKET_ARROW, MoveType.HORIZONTAL) .build()) .withBaseTexture() // Looking for existing renderers in CEu. but yeah, you can also use here @@ -57,7 +56,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .withPattern(function(controller as IControllerTile) as IBlockPattern { return FactoryBlockPattern.start() .aisle( - "CCMCC", + "CCCCC", "CGGGC", "CGGGC", "CGGGC", @@ -91,8 +90,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .where('D', ) .where('V', ) .where(' ', CTPredicate.getAny()) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, false)) - .where('M', controller.autoAbilities(false, false, false, false, false, false, true)) // same as CTPredicate.abilities() + .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -101,7 +99,6 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .maxInputs(4) .minOutputs(1) .maxOutputs(16) - .maxFluidInputs(1) //.setProgressBar(ROCKET_ARROW, MoveType.HORIZONTAL) .build()) .withBaseTexture() // Looking for existing renderers in CEu. but yeah, you can also use here @@ -120,7 +117,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a " ", " CCCCC ", " CVCVC ", - " CCMCC ", + " CCCCC ", " CVCVC ", " CCCCC ", " ", @@ -191,8 +188,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a .where('V', ) .where(' ', CTPredicate.getAny()) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, false)) - .where('M', controller.autoAbilities(false, false, false, false, false, false, true)) // same as CTPredicate.abilities() + .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs index 53f31a2..6fdf4b4 100644 --- a/overrides/scripts/multiblocks_normal.zs +++ b/overrides/scripts/multiblocks_normal.zs @@ -25,14 +25,13 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") .withPattern(function(controller as IControllerTile) as IBlockPattern { return FactoryBlockPattern.start() .aisle("CCC", "CVC", "CCC") - .aisle("CCC", "GDG", "CMC") + .aisle("CCC", "GDG", "CCC") .aisle("CSC", "CGC", "CCC") .where('S', controller.self()) .where('G', ) .where('V', ) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, false)) - .where('M', controller.autoAbilities(false, false, false, false, false, false, true)) // same as CTPredicate.abilities() + .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -41,7 +40,7 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") .maxInputs(4) .minOutputs(1) .maxOutputs(16) - .maxFluidInputs(2) + .maxFluidInputs(1) //.setProgressBar(ROCKET_ARROW, MoveType.HORIZONTAL) .build()) .withBaseTexture() // Looking for existing renderers in CEu. but yeah, you can also use here @@ -56,7 +55,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .withPattern(function(controller as IControllerTile) as IBlockPattern { return FactoryBlockPattern.start() .aisle( - "CCMCC", + "CCCCC", "CGGGC", "CGGGC", "CGGGC", @@ -90,8 +89,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .where('D', ) .where('V', ) .where(' ', CTPredicate.getAny()) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, false)) - .where('M', controller.autoAbilities(false, false, false, false, false, false, true)) // same as CTPredicate.abilities() + .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -100,7 +98,6 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .maxInputs(4) .minOutputs(1) .maxOutputs(16) - .maxFluidInputs(1) //.setProgressBar(ROCKET_ARROW, MoveType.HORIZONTAL) .build()) .withBaseTexture() // Looking for existing renderers in CEu. but yeah, you can also use here @@ -119,7 +116,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a " ", " CCCCC ", " CVCVC ", - " CCMCC ", + " CCCCC ", " CVCVC ", " CCCCC ", " ", @@ -190,8 +187,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a .where('V', ) .where(' ', CTPredicate.getAny()) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, false)) - .where('M', controller.autoAbilities(false, false, false, false, false, false, true)) // same as CTPredicate.abilities() + .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap(