0.2.21.0

changelog.md

@@ -1,5 +1,15 @@
 # 变更日志 Changelog
 
+## 0.2.21.0 _2020-01-08 15:30_
+
+* 移除部分无用方块和物品 removed some useless blocks and items
+* 为部分方块和物品增加材质贴图 added textures to some blocks and items
+* 增加部分合成表 added some recipes
+* 调整部分材料属性 adjusted attribution of some materials
+* 细节改进 minor improvements
+* 增加物品 added items
+  * 相变之石 phasing gem
+
 ## 0.2.20.0 _2020-01-07 16:00_
 
 * 添加语言文件 added lang files
@@ -13,7 +23,7 @@
 
 ## 0.2.19.0 _2020-01-04 14:30_
 
-* 重写世界生成的方式, 现在各种矿石可以正常在世界中生成 rewrote the way of world-generating which enable generating ores
+* 重写世界生成的方式, 现在各种矿石可以正常在世界中生成 rewrote world-generation which enable generating ores
 
 ## 0.2.18.4 _2020-01-03 11:30_
 

materials.md

@@ -6,12 +6,13 @@
 ⭕|已实现 仅创造模式使用
 🖊|仍在实现代码
 📕|仍在构思
+🚮|已经废弃
 
 ## 材料列表
 
 进度|类型|名称|英文|修饰符|来源|描述|颜色
 -|-|-|-|-|-|-|-
-⭕|金属|奢华合金|royal alloy|奢华 磁引|2铁+1金=合金|--
+⭕|金属|奢华合金|royal alloy|奢华 磁引2|2铁+1金=合金|--
 📕|木石|云|cloud|柔软|采集
 📕|木石|雷暴云|thunder cloud|柔软 雷鸣|采集
 📕|木石|天空水晶|sky crystal|轻便|采集
@@ -24,21 +25,28 @@
 📕|金属|天堂金属|paradium|
 ⭕|木石|蛛腿|spider leg|剧毒|掉落物
 ⭕|木石|坚硬蛛腿|hard spider leg|剧毒|掉落物
-📕|木石|玻璃|glass|脆弱 廉价 轻便|采集
+🚮|木石|玻璃|glass|脆弱 廉价 轻便|采集
 📕|木石|强化玻璃|consolidated glass|廉价 轻便 动力|合成
-⭕|木石|刚玉|corundum|群簇|采集
+⭕|木石|刚玉|corundum|群簇 致残(头)|采集
 ⭕|金属|钛|titanium|锋利 轻便|采集||LightSteelBlue
-⭕|金属|勾陈|polarium||采集||LightSkyBlue
-⭕|金属|哈雷|halleium||采集||MediumSlateBlue
-⭕|金属|河鼓|altairium||采集
+⭕|金属|勾陈|polarium|超自然 致残(头)|采集||LightSkyBlue
+⭕|金属|哈雷|halleium|锯齿 换位|采集||MediumSlateBlue
+⭕|金属|河鼓|altairium|星绽|采集
 ⭕|金属|可可|cocoa|美味|采集||Chocolate
 ⭕|木石|硝石|nitre|可溶|采集
-⭕|木石|叶蜡石|pyrophyllite||采集||LightGreen
-⭕|木石|藻绿石|algae|生态 吝啬|采集
+⭕|木石|叶蜡石|pyrophyllite|生态|采集||LightGreen
+📕|木石|藻绿石|algae|生态 吝啬|采集
 ⭕|木石|冰洲石|iceland spar|双折|采集
-⭕|木石|尖晶石|spinel||采集
-⭕|木石|电气石|talcum|热释电|采集
+⭕|木石|尖晶石|spinel|撼击|采集
+⭕|木石|滑石|talcum|铭刻|采集
+⭕|木石|电气石|tourmaline|热释电|采集
 ⭕|金属|钝金|tonium|压制|采集
+⭕|木石|陨石|meteorolite|异形|采集
+⭕|金属|沉银|immersed silver|贪心|采集
+⭕|金属|秘银|mithril|轻便|采集
+⭕|金属|精金|adamantine|超自然 石缚|采集
+⭕|木石|黑石|blackrock|廉价 吝啬|采集
+⭕|木石|红宝石|ruby|老成 致密|采集
 
 ## 修饰符列表
 
@@ -54,10 +62,11 @@
 -|属性|后知|retrospective|使用时提升工具属性
 -|被动(攻击)|双星|spica|将攻击目标移动到跟攻击者直线上固定距离
 -|被动(攻击)|反重力|anti-grav|附加漂浮debuff
--|被动|奢华|expensive|维修时提供的耐久更少
+-|被动|奢华|luxurious|维修时提供的耐久更少
 -|属性|群簇|clustering|工具总耐久高于指定值会增加攻击力 低于指定值会增加速度
 -|属性|硬化|hardened|降低工具速度 增加工具耐久和攻击力
 -|属性|打磨|polished|增加工具速度 降低工具耐久和攻击力
+-|属性|||提升工具速度 降低工具耐久和攻击力和挖掘等级
 -|被动(攻击)|星绽|star dashing|攻击时向周围释放火焰粒子 可以点燃生物
 -|被动|可溶|soluble|在水下手持工具会持续快速降低耐久
 -|被动(攻击)|双折|birefringent|攻击时有几率再造成一次伤害
@@ -69,3 +78,4 @@
 -|被动(采集 攻击)|亡灵呼唤|undead calling|小几率在周围生成僵尸或骷髅
 -|被动(攻击)|_未命名1_||攻击时恢复耐久 给目标施加debuff
 -|被动(攻击)|压制|repressing|给目标施加沉重debuff
+-|被动|冰冷|icy|给目标施加缓慢debuff 寒冷环境下慢慢恢复耐久 炎热环境下慢慢损失耐久

src/main/java/firok/tiths/TinkersThings.java

@@ -28,7 +28,7 @@ public class TinkersThings
 
 	public static final String MOD_ID = "tiths";
 	public static final String MOD_NAME = "Tinkers Things";
-	public static final String VERSION = "1.12.2-0.2.20.0";
+	public static final String VERSION = "1.12.2-0.2.21.0";
 
 
 	{

src/main/java/firok/tiths/common/Blocks.java

@@ -2,6 +2,7 @@
 
 import firok.tiths.block.*;
 import firok.tiths.block.logic.BlockLogicSearing;
+import firok.tiths.indev.BlockOreShell;
 import firok.tiths.util.GenMeteoWorld;
 import firok.tiths.util.GenOreWorld;
 import firok.tiths.util.Reg;
@@ -45,8 +46,8 @@ public class Blocks
 	@Reg(Keys.oreRuby)
 	@GenOreWorld(times = 5,timeRate = 0.6f,size = 4,minY = 10,maxY = 60)
 	public static final BlockOre oreRuby = new BlockOre(Items.ruby,1,1,1,6,10); // 红宝石矿
-	@Reg(Keys.oreShell)
-	public static final BlockOreShell oreShell = new BlockOreShell(Items.shell,3,6,1,4,6); // 散贝壳方块
+//	@Reg(Keys.oreShell)
+//	public static final BlockOreShell oreShell = new BlockOreShell(Items.shell,3,6,1,4,6); // 散贝壳方块
 	@Reg(Keys.oreCorundum)
 	@GenOreWorld(times = 5,timeRate = 0.8f,size = 4,minY = 10,maxY = 80)
 	public static final BlockOre oreCorundum = new BlockOre(Items.corundum,1,1,1,2,4); // 刚玉矿
@@ -142,10 +143,10 @@ public class Blocks
 
 	@Reg(Keys.blockStellariumObsidian)
 	public static final Block blockStellariumObsidian = new Block(Material.ROCK); // 恒星黑曜石
-	@Reg(Keys.blockBloodPumpkin)
-	public static final Block blockBloodPumpkin = new Block(Material.WOOD); // 血南瓜
-	@Reg(Keys.blockWeepingPumpkin)
-	public static final Block blockWeepingPumpkin = new Block(Material.WOOD); // 哭泣的南瓜
+//	@Reg(Keys.blockBloodPumpkin)
+//	public static final Block blockBloodPumpkin = new Block(Material.WOOD); // 血南瓜
+//	@Reg(Keys.blockWeepingPumpkin)
+//	public static final Block blockWeepingPumpkin = new Block(Material.WOOD); // 哭泣的南瓜
 	@Reg(Keys.blockBloodSand)
 	public static final Block blockBloodSand = new BlockBloodSand(); // 血沙
 	@Reg(Keys.blockConsolidatedGlass)
@@ -154,21 +155,25 @@ public class Blocks
 	public static final Block blockCoagulatedBloodSand = new BlockCompressed(); // 凝结血沙
 
 	// 一些装饰用方块
-	@Reg(Keys.blockRoyalEnchantmentTable)
-	public static final Block blockRoyalEnchantmentTable = new BlockEnchantmentTable(){}; // todo
+//	@Reg(Keys.blockRoyalEnchantmentTable)
+//	public static final Block blockRoyalEnchantmentTable = new BlockEnchantmentTable(){}; // todo
 
 	// 植物
-	@Reg(Keys.saplingHura)
-	public static final Block blockSaplingHura = new BlockSapling(GenTreeHura::generate,3);
-	@Reg(Keys.logHura)
-	public static final Block blockLogHura = new BlockWood();
-	@Reg(Keys.leafHura)
-	public static final Block blockLeafHura = new BlockLeaf(blockSaplingHura,60);
+//	@Reg(Keys.saplingHura)
+//	public static final Block blockSaplingHura = new BlockSapling(GenTreeHura::generate,3);
+//	@Reg(Keys.logHura)
+//	public static final Block blockLogHura = new BlockWood();
+//	@Reg(Keys.leafHura)
+//	public static final Block blockLeafHura = new BlockLeaf(blockSaplingHura,60);
 
-	@Reg(Keys.saplingBlood)
-	public static final Block blockSaplingBlood = new BlockSapling();
-	@Reg(Keys.logBlood)
-	public static final Block blockLogBlood = new BlockWood();
-	@Reg(Keys.leafBlood)
-	public static final Block blockLeafBlood = new BlockLeaf(blockSaplingBlood,50);
+//	@Reg(Keys.saplingBlood)
+//	public static final Block blockSaplingBlood = new BlockSapling();
+//	@Reg(Keys.logBlood)
+//	public static final Block blockLogBlood = new BlockWood();
+//	@Reg(Keys.leafBlood)
+//	public static final Block blockLeafBlood = new BlockLeaf(blockSaplingBlood,50);
+
+	// 逻辑方块
+//	@Reg(Keys.blockLogicSearing)
+//	public static final Block logicSearing = new BlockLogicSearing(); // 逻辑 - 焦黑窖
 }

src/main/java/firok/tiths/common/Craftings.java

@@ -27,8 +27,6 @@ public static void registerAllCraftings()
 		registerBindings();
 		registerBasinCastings();
 		registerTableCastings();
-		registerShapelessCraftings();
-		registerShapedCraftings();
 	}
 
 	// 原矿 矿块 矿锭 矿粒 之间的合成关系
@@ -58,12 +56,19 @@ private static void registerBasinCastings()
 						RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.OBSIDIAN)),
 						new FluidStack(Fluids.moltenStellarium, Material.VALUE_Ingot*4),
 				true, false));
-		// 血南瓜
+//		// 血南瓜
+//		registerBasinCasting(
+//				new CastingRecipe(
+//						new ItemStack(Blocks.blockBloodPumpkin),
+//						RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.PUMPKIN)),
+//						new FluidStack(TinkerFluids.blood, Material.VALUE_Ingot*8),
+//						true, false));
+		// 血沙
 		registerBasinCasting(
 				new CastingRecipe(
-						new ItemStack(Blocks.blockBloodPumpkin),
-						RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.PUMPKIN)),
-						new FluidStack(TinkerFluids.blood, Material.VALUE_Ingot*8),
+						new ItemStack(Blocks.blockBloodSand),
+						RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.SOUL_SAND)),
+						new FluidStack(TinkerFluids.blood, Material.VALUE_Ingot * 4),
 						true, false));
 		// 凝结血沙
 		registerBasinCasting(
@@ -97,6 +102,13 @@ private static void registerTableCastings()
 						RecipeMatch.of(new ItemStack(net.minecraft.init.Items.DYE,1,EnumDyeColor.BLACK.getDyeDamage())),
 						new FluidStack(TinkerFluids.purpleSlime, Material.VALUE_Ingot*2),
 						true, false));
+		// 末影之石
+		registerTableCasting(
+				new CastingRecipe(
+						new ItemStack(Items.enderGem),
+						RecipeMatch.of(new ItemStack(net.minecraft.init.Items.ENDER_PEARL)),
+						new FluidStack(TinkerFluids.emerald, Material.VALUE_Ingot*1),
+						true, false));
 		// 岩浆膏
 		registerTableCasting(
 				new CastingRecipe(
@@ -118,12 +130,12 @@ private static void registerTableCastings()
 						true, false));
 
 		// 奢华纸张
-		registerTableCasting(
-				new CastingRecipe(
-						new ItemStack(Items.royalPaper),
-						RecipeMatch.of(new ItemStack(net.minecraft.init.Items.PAPER)),
-						new FluidStack(Fluids.moltenRoyalAlloy, Material.VALUE_Nugget*1),
-						true, false));
+//		registerTableCasting(
+//				new CastingRecipe(
+//						new ItemStack(Items.royalPaper),
+//						RecipeMatch.of(new ItemStack(net.minecraft.init.Items.PAPER)),
+//						new FluidStack(Fluids.moltenRoyalAlloy, Material.VALUE_Nugget*1),
+//						true, false));
 
 		// 灼热面包
 		registerTableCasting(
@@ -140,16 +152,6 @@ private static void registerTableCastings()
 						new FluidStack(FluidRegistry.LAVA, Material.VALUE_Nugget*1),
 						true, false));
 	}
-	// 无序合成
-	private static void registerShapelessCraftings()
-	{
-		// 哭泣南瓜
-	}
-	// 有序合成
-	private static void registerShapedCraftings()
-	{
-		;
-	}
 
 	private static void createBinding(
 			Block ore,Block block,Fluid fluid,

src/main/java/firok/tiths/common/Events.java

@@ -3,19 +3,28 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntitySpider;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Biomes;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import java.util.Random;
+
 import static firok.tiths.traits.TraitStonePhasing.costStone;
+import static firok.tiths.util.Predicates.canTrigger;
 
 @Mod.EventBusSubscriber
 public class Events
@@ -24,20 +33,72 @@ public class Events
 	public static void onBlockBroken(BlockEvent.BreakEvent event)
 	{
 		World world=event.getWorld();
-		if(world.isRemote) return;
+		if(world.isRemote) return; // 只在服务端执行
+
 		BlockPos pos=event.getPos();
 		Block block=world.getBlockState(pos).getBlock();
-		if(block== Blocks.ICE)
+
+		// 碎冰
+		TRY_DROP_BROKEN_ICE:if(block== Blocks.ICE)
 		{
 			int amount=1+world.rand.nextInt(6);
 			ItemStack stack=new ItemStack(Items.brokenIce,amount);
 			EntityItem ei=new EntityItem(world,pos.getX(),pos.getY(),pos.getZ(),stack);
 
 			world.spawnEntity(ei); // spawn broken ice
+			break TRY_DROP_BROKEN_ICE;
 		}
+		// 贝壳
+		else TRY_DROP_SHELL:if(block== Blocks.SAND)
+		{
+			if(!canTrigger(world,0.28f)) break TRY_DROP_SHELL;
 
+			Biome biome=world.getBiome(pos);
+			if(biome== Biomes.BEACH ||
+					biome==Biomes.COLD_BEACH ||
+					biome==Biomes.OCEAN ||
+					biome==Biomes.DEEP_OCEAN
+			){
+				int amount= 1+ world.rand.nextInt(2);
+				ItemStack stack=new ItemStack(Items.shell,amount);
+				EntityItem ei=new EntityItem(world,pos.getX(),pos.getY(),pos.getZ(),stack);
+				world.spawnEntity(ei);
+			}
+			break TRY_DROP_SHELL;
+		}
 	}
 
+	@SubscribeEvent
+	public static void onEntityDead(LivingDeathEvent event)
+	{
+		EntityLivingBase living=event.getEntityLiving();
+		World world=living.world;
+		if(world.isRemote) return;
+		Random rand=world.rand;
+
+		ItemStack stack2drop=null;
+		if(living instanceof EntityCaveSpider) // 洞穴蜘蛛
+		{
+			if(canTrigger(rand,0.35f))
+			{
+				stack2drop=new ItemStack(Items.spiderLeg,1+rand.nextInt(2));
+			}
+		}
+		else if(living instanceof EntitySpider) // 蜘蛛
+		{
+			if(canTrigger(rand,0.45f))
+			{
+				stack2drop=new ItemStack(canTrigger(rand,0.3f)?Items.hardSpiderLeg:Items.spiderLeg,1+rand.nextInt(1));
+			}
+		}
+
+		// 掉落物品
+		if(stack2drop!=null)
+		{
+			EntityItem ei=new EntityItem(world,living.posX,living.posY,living.posZ,stack2drop);
+			world.spawnEntity(ei);
+		}
+	}
 
 	@SubscribeEvent
 	public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event)

src/main/java/firok/tiths/common/Fluids.java

@@ -1,5 +1,6 @@
 package firok.tiths.common;
 
+import firok.tiths.util.RegSmelteryFuel;
 import net.minecraft.util.ResourceLocation;
 import slimeknights.tconstruct.library.fluid.FluidMolten;
 
@@ -9,6 +10,7 @@
 public class Fluids
 {
 	public static final FluidMolten moltenRoyalAlloy=$(nameRoyalAlloy, colorRoyalAlloy);
+	@RegSmelteryFuel(amount=10,duration=400)
 	public static final FluidMolten moltenStellarium=$(nameStellarium, colorStellarium);
 	public static final FluidMolten moltenHothium=$(nameHothium, colorHothium);
 	public static final FluidMolten moltenCinnabar=$(nameCinnabar, colorCinnabar);
@@ -35,10 +37,10 @@ public class Fluids
 				new ResourceLocation("tconstruct:blocks/fluids/molten_metal"),
 				new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow")
 				);
-		fluid.setTemperature(temp);
-		fluid.setLuminosity(lumen);
-		fluid.setViscosity(visc);
-		fluid.setDensity(dens);
+		fluid.setTemperature(temp); // 温度
+		fluid.setLuminosity(lumen); // 亮度
+		fluid.setViscosity(visc); // 黏度
+		fluid.setDensity(dens); // 密度
 		return fluid;
 	}
 }