提交: 80fb75351f90f15dcd53fa93741e05669556f420 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修订版: 80fb75351f90f15dcd53fa93741e05669556f420 (tree)
• 时间: 2021-04-04 05:44:45
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P.: fixed wall model rotations and bounding...more

更改概述

• modified: Assorted/Assorted.csproj
• modified: Assorted/BlockBehaviors/BlockBehaviorNeedSides.cs
• modified: Assorted/BlockClasses/CollapsingBlock.cs
• modified: Assorted/assets/defensive/blocktypes/ceramic/enclosed_candle.json
• modified: Assorted/assets/defensive/blocktypes/stone/false_wall.json
• modified: Assorted/assets/defensive/lang/en.json
• modified: Assorted/assets/defensive/recipes/smithing/grille_h.json
• modified: Assorted/assets/defensive/recipes/smithing/grille_v.json

差异

--- a/Assorted/Assorted.csproj
+++ b/Assorted/Assorted.csproj
@@ -161,7 +161,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="assets\defensive\blocktypes\metal\brazier.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="assets\defensive\shapes\block\stone\brick_w_candle.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -170,7 +169,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="assets\defensive\blocktypes\stone\sconse_brick.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="assets\defensive\shapes\block\wood\false_floor.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

--- a/Assorted/BlockBehaviors/BlockBehaviorNeedSides.cs
+++ b/Assorted/BlockBehaviors/BlockBehaviorNeedSides.cs
@@ -62,7 +62,7 @@ namespace FirstMachineAge
 		}
 		else
 		{
-		failureCode = @"requirehorizontalattachable";
+		failureCode = @"requirehorizontalside";
 		}
 
 		return true;

--- a/Assorted/BlockClasses/CollapsingBlock.cs
+++ b/Assorted/BlockClasses/CollapsingBlock.cs
@@ -48,9 +48,7 @@ namespace FirstMachineAge
 			}
 
 		if (enough) {
-		localAcc.BlockAccessor.BreakBlock(here.Copy(), null);
-		//TODO: Sound & Dust
-		
+		localAcc.BlockAccessor.BreakBlock(here.Copy(), null);				
 		}
 
 		}
@@ -98,7 +96,7 @@ namespace FirstMachineAge
 		#endif
 
 		//Tick Callback; in 200ms...
-		ServerAPI.World.RegisterCallbackUnique(MabeyCollapse, pos.Copy() ,50);		
+		ServerAPI.World.RegisterCallback(MabeyCollapse, pos.Copy() ,50);		
 		}
 
 		public override void OnEntityInside(IWorldAccessor world, Entity entity, BlockPos pos)
@@ -111,7 +109,7 @@ namespace FirstMachineAge
 		#endif
 
 		//Tick Callback; in 200ms...
-		ServerAPI.World.RegisterCallbackUnique(MabeyCollapse, pos.Copy( ), 50);
+		ServerAPI.World.RegisterCallback(MabeyCollapse, pos.Copy( ), 50);
 		}
 
 		public override string GetPlacedBlockName(IWorldAccessor world, BlockPos pos)
@@ -140,29 +138,31 @@ namespace FirstMachineAge
 		return false;
 		}
 
-		public override void OnBlockBroken(IWorldAccessor world, BlockPos pos, IPlayer byPlayer, float dropQuantityMultiplier = 1)
+		public override void OnBlockRemoved(IWorldAccessor world, BlockPos pos)
 		{
 		if (api.Side.IsClient( )) {
+		var capi = api as ICoreClientAPI;
 		//Bits of broken block
 
-		var particleProps = new SimpleParticleProperties(1, 3, this.GetRandomColor(api as ICoreClientAPI, pos.Copy( ), BlockFacing.UP), new Vec3d( ), new Vec3d( ), new Vec3f(-0.25f, -0.25f, -0.25f), new Vec3f(0.25f, 0.25f, 0.25f), 1, 1, 0.1f, 0.3f, EnumParticleModel.Quad);
-		particleProps.AddPos.Set(1.4, 1.4, 1.4);
-		particleProps.AddQuantity = 20;
-		particleProps.MinVelocity.Set(-0.25f, 0, -0.25f);
-		particleProps.AddVelocity.Set(0.5f, 1, 0.5f);
+		var particleProps = new SimpleParticleProperties(9, 12, this.GetRandomColor(api as ICoreClientAPI, pos.Copy( ), BlockFacing.UP), pos.ToVec3d( ),pos.ToVec3d( ), Vec3f.Zero, Vec3f.Zero);
+		
+		particleProps.MinQuantity = 9;
+		particleProps.MinVelocity.Set(-0.05f, 0, -0.05f);		
+		particleProps.AddVelocity.Set(0.5f, 0, 0.5f);
 		particleProps.WithTerrainCollision = true;
 		particleProps.ParticleModel = EnumParticleModel.Cube;
-		particleProps.LifeLength = 1.5f;
-		particleProps.SizeEvolve = EvolvingNatFloat.create(EnumTransformFunction.QUADRATIC, -0.5f);
+		particleProps.LifeLength = 1.5f;		
 		particleProps.GravityEffect = 2.5f;
-		particleProps.MinSize = 0.5f;
-		particleProps.MaxSize = 1.5f;
+		particleProps.MinSize = 0.75f;
+		particleProps.MaxSize = 1.0f;
+		particleProps.WithTerrainCollision = true;
+
+		capi.World.SpawnParticles(particleProps);
+		//TODO: Sound 
 
-		byPlayer.Entity.World.SpawnParticles(particleProps, byPlayer);
-		
 		}
 
-		base.OnBlockBroken(world, pos, byPlayer, dropQuantityMultiplier);
+		base.OnBlockRemoved(world, pos);
 		}
 
 		#endregion

--- a/Assorted/assets/defensive/blocktypes/ceramic/enclosed_candle.json
+++ b/Assorted/assets/defensive/blocktypes/ceramic/enclosed_candle.json
@@ -1,9 +1,9 @@
 {
 	code: "enclosed_candle",	
 	storageFlags: 1,
-    behaviors: [{name: "HorizontalOrientable"}],
+    behaviors: [{name: "HorizontalAttachable", properties: {  dropBlockFace: "north" }}],
 	variantgroups: [		
-		{ code:"wall", loadFromProperties: "abstract/horizontalorientation" }
+		{ code:"side", loadFromProperties: "abstract/horizontalorientation" }
 	],   
     collisionbox: null,
     renderpass: "OpaqueNoCull",

--- a/Assorted/assets/defensive/blocktypes/stone/false_wall.json
+++ b/Assorted/assets/defensive/blocktypes/stone/false_wall.json
@@ -26,24 +26,24 @@
     shapeinventory: { base: "block/stone/false_wall_inv" },
 	shapebytype: {
 		"*-north-down-closed-*": { base: "block/stone/false_wall_lower", rotateY: 0 },
-		"*-north-up-closed-*": { base: "block/stone/false_wall_upper", rotateY: 0 },
-		"*-north-down-opened-*": { base: "block/stone/false_wall_lower" , rotateY: -90, offsetX: -0.80  },
-		"*-north-up-opened-*": { base: "block/stone/false_wall_upper",  rotateY: -90, offsetX: -0.80 },
+		"*-north-up-closed-*": { base: "block/stone/false_wall_upper",   rotateY: 0 },
+		"*-north-down-opened-*": { base: "block/stone/false_wall_lower" ,rotateY: -90, offsetX: -0.80  },
+		"*-north-up-opened-*": { base: "block/stone/false_wall_upper",   rotateY: -90, offsetX: -0.80 },
 		
-		"*-east-down-closed-*": { base:"block/stone/false_wall_lower", rotateY: 90 },
-		"*-east-up-closed-*": { base: "block/stone/false_wall_upper", rotateY: 90 },
-		"*-east-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 180, offsetX: -0.20 },
-		"*-east-up-opened-*": { base: "block/stone/false_wall_upper",  rotateY: 180, offsetX: -0.20 },
+		"*-east-down-closed-*": { base:"block/stone/false_wall_lower",   rotateY: 90 },
+		"*-east-up-closed-*": { base: "block/stone/false_wall_upper",    rotateY: 90 },
+		"*-east-down-opened-*": { base: "block/stone/false_wall_lower",  rotateY: 0, offsetZ: 0.80 },
+		"*-east-up-opened-*": { base: "block/stone/false_wall_upper",    rotateY: 0, offsetZ: 0.80 },
 		
 		"*-south-down-closed-*": { base: "block/stone/false_wall_lower", rotateY: 180 },
-		"*-south-up-closed-*": { base: "block/stone/false_wall_upper", rotateY:180 },
-		"*-south-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 270, offsetX: -0.80 },
-		"*-south-up-opened-*": { base: "block/stone/false_wall_upper", rotateY: 270, offsetX: -0.80 },
+		"*-south-up-closed-*": { base: "block/stone/false_wall_upper",   rotateY:180 },
+		"*-south-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 90, offsetX: 0.80 },
+		"*-south-up-opened-*": { base: "block/stone/false_wall_upper",   rotateY: 90, offsetX: 0.80 },
 		
-		"*-west-down-closed-*": { base: "block/stone/false_wall_lower", rotateY: 270 },
-		"*-west-up-closed-*": { base: "block/stone/false_wall_upper", rotateY: 270 },
-		"*-west-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 0, offsetX: -0.20 },
-		"*-west-up-opened-*": { base: "block/stone/false_wall_upper", rotateY: 0, offsetX: -0.20 },				
+		"*-west-down-closed-*": { base: "block/stone/false_wall_lower",  rotateY: 270 },
+		"*-west-up-closed-*": { base: "block/stone/false_wall_upper",    rotateY: 270 },
+		"*-west-down-opened-*": { base: "block/stone/false_wall_lower",  rotateY: 180, offsetZ: -0.80 },
+		"*-west-up-opened-*": { base: "block/stone/false_wall_upper",    rotateY: 180, offsetZ: -0.80 },				
 	},
 	blockmaterial: "Stone",
 	replaceable: 500,
@@ -107,14 +107,14 @@
 	},	
 	collisionbox: { x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25,
 		rotateYByType: {
-			"*-north-*-opened-*": 90,
-			"*-north-*-closed-*": 0,
-			"*-west-*-opened-*": -180,
-			"*-west-*-closed-*": -90,
-			"*-east-*-opened-*": 180,
-			"*-east-*-closed-*": 90,
-			"*-south-*-opened-*": -90,
-			"*-south-*-closed-*": 90,
+			"*-north-*-opened-*":  90,
+           	"*-south-*-opened-*": 270,
+            "*-east-*-opened-*":  180,         
+            "*-west-*-opened-*": 	0,
+			"*-north-*-closed-*":   0,
+            "*-south-*-closed-*": 180,
+            "*-east-*-closed-*":   90,			
+			"*-west-*-closed-*":  -90,						
 		}
 	},	
 	sounds: {		

--- a/Assorted/assets/defensive/lang/en.json
+++ b/Assorted/assets/defensive/lang/en.json
@@ -12,4 +12,5 @@
     "defensive:bolted_shut": "<font color='red'>Bolted Shut!</font>",
     "defensive:bolted_open": "Its Open.",
     "defensive:block-enclosed_candle-*":"Enclosed candle holder",
+	"defensive:placefailure-requirehorizontalside": "Cannot place block here! It needs one solid sided block adjacent.",
 }
\ No newline at end of file

--- a/Assorted/assets/defensive/recipes/smithing/grille_h.json
+++ b/Assorted/assets/defensive/recipes/smithing/grille_h.json
@@ -11,6 +11,6 @@
         "_#___#___#_",
 		"_#___#___#_",		
 	]],
-	name: "Lattice Iron Grille",
+	name: "Lattice Iron Grille H",
 	output: { type: "block", code: "defensive:grille_horizontal-north", stacksize: 3  }
 }
\ No newline at end of file

--- a/Assorted/assets/defensive/recipes/smithing/grille_v.json
+++ b/Assorted/assets/defensive/recipes/smithing/grille_v.json
@@ -11,6 +11,6 @@
 		"_#_______#_",		
 		"_#_______#_",		
 	]],
-	name: "Lattice Iron Grille",
-	output: { type: "block", code: "defensive:grille_vertical-north", stacksize: 3  }
+	name: "Lattice Iron Grille V",
+	output: { type: "block", code: "defensive:grille_vertical-down", stacksize: 3  }
 }
\ No newline at end of file