Skip to content

Commit 09d7c8d

Browse files
FirokOtakuFirokOtaku
committed
0.2.21.0
1 parent 1ecfdfe commit 09d7c8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+452
-141
lines changed

Diff for: ‎changelog.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# 变更日志 Changelog
22

3+
## 0.2.21.0 _2020-01-08 15:30_
4+
5+
* 移除部分无用方块和物品 removed some useless blocks and items
6+
* 为部分方块和物品增加材质贴图 added textures to some blocks and items
7+
* 增加部分合成表 added some recipes
8+
* 调整部分材料属性 adjusted attribution of some materials
9+
* 细节改进 minor improvements
10+
* 增加物品 added items
11+
* 相变之石 phasing gem
12+
313
## 0.2.20.0 _2020-01-07 16:00_
414

515
* 添加语言文件 added lang files
@@ -13,7 +23,7 @@
1323

1424
## 0.2.19.0 _2020-01-04 14:30_
1525

16-
* 重写世界生成的方式, 现在各种矿石可以正常在世界中生成 rewrote the way of world-generating which enable generating ores
26+
* 重写世界生成的方式, 现在各种矿石可以正常在世界中生成 rewrote world-generation which enable generating ores
1727

1828
## 0.2.18.4 _2020-01-03 11:30_
1929

Diff for: ‎materials.md

+21-11
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
⭕|已实现 仅创造模式使用
77
🖊|仍在实现代码
88
📕|仍在构思
9+
🚮|已经废弃
910

1011
## 材料列表
1112

1213
进度|类型|名称|英文|修饰符|来源|描述|颜色
1314
-|-|-|-|-|-|-|-
14-
⭕|金属|奢华合金|royal alloy|奢华 磁引|2铁+1金=合金|--
15+
⭕|金属|奢华合金|royal alloy|奢华 磁引2|2铁+1金=合金|--
1516
📕|木石|云|cloud|柔软|采集
1617
📕|木石|雷暴云|thunder cloud|柔软 雷鸣|采集
1718
📕|木石|天空水晶|sky crystal|轻便|采集
@@ -24,21 +25,28 @@
2425
📕|金属|天堂金属|paradium|
2526
⭕|木石|蛛腿|spider leg|剧毒|掉落物
2627
⭕|木石|坚硬蛛腿|hard spider leg|剧毒|掉落物
27-
📕|木石|玻璃|glass|脆弱 廉价 轻便|采集
28+
🚮|木石|玻璃|glass|脆弱 廉价 轻便|采集
2829
📕|木石|强化玻璃|consolidated glass|廉价 轻便 动力|合成
29-
⭕|木石|刚玉|corundum|群簇|采集
30+
⭕|木石|刚玉|corundum|群簇 致残(头)|采集
3031
⭕|金属|钛|titanium|锋利 轻便|采集||LightSteelBlue
31-
⭕|金属|勾陈|polarium||采集||LightSkyBlue
32-
⭕|金属|哈雷|halleium||采集||MediumSlateBlue
33-
⭕|金属|河鼓|altairium||采集
32+
⭕|金属|勾陈|polarium|超自然 致残(头)|采集||LightSkyBlue
33+
⭕|金属|哈雷|halleium|锯齿 换位|采集||MediumSlateBlue
34+
⭕|金属|河鼓|altairium|星绽|采集
3435
⭕|金属|可可|cocoa|美味|采集||Chocolate
3536
⭕|木石|硝石|nitre|可溶|采集
36-
⭕|木石|叶蜡石|pyrophyllite||采集||LightGreen
37-
⭕|木石|藻绿石|algae|生态 吝啬|采集
37+
⭕|木石|叶蜡石|pyrophyllite|生态|采集||LightGreen
38+
📕|木石|藻绿石|algae|生态 吝啬|采集
3839
⭕|木石|冰洲石|iceland spar|双折|采集
39-
⭕|木石|尖晶石|spinel||采集
40-
⭕|木石|电气石|talcum|热释电|采集
40+
⭕|木石|尖晶石|spinel|撼击|采集
41+
⭕|木石|滑石|talcum|铭刻|采集
42+
⭕|木石|电气石|tourmaline|热释电|采集
4143
⭕|金属|钝金|tonium|压制|采集
44+
⭕|木石|陨石|meteorolite|异形|采集
45+
⭕|金属|沉银|immersed silver|贪心|采集
46+
⭕|金属|秘银|mithril|轻便|采集
47+
⭕|金属|精金|adamantine|超自然 石缚|采集
48+
⭕|木石|黑石|blackrock|廉价 吝啬|采集
49+
⭕|木石|红宝石|ruby|老成 致密|采集
4250

4351
## 修饰符列表
4452

@@ -54,10 +62,11 @@
5462
-|属性|后知|retrospective|使用时提升工具属性
5563
-|被动(攻击)|双星|spica|将攻击目标移动到跟攻击者直线上固定距离
5664
-|被动(攻击)|反重力|anti-grav|附加漂浮debuff
57-
-|被动|奢华|expensive|维修时提供的耐久更少
65+
-|被动|奢华|luxurious|维修时提供的耐久更少
5866
-|属性|群簇|clustering|工具总耐久高于指定值会增加攻击力 低于指定值会增加速度
5967
-|属性|硬化|hardened|降低工具速度 增加工具耐久和攻击力
6068
-|属性|打磨|polished|增加工具速度 降低工具耐久和攻击力
69+
-|属性|||提升工具速度 降低工具耐久和攻击力和挖掘等级
6170
-|被动(攻击)|星绽|star dashing|攻击时向周围释放火焰粒子 可以点燃生物
6271
-|被动|可溶|soluble|在水下手持工具会持续快速降低耐久
6372
-|被动(攻击)|双折|birefringent|攻击时有几率再造成一次伤害
@@ -69,3 +78,4 @@
6978
-|被动(采集 攻击)|亡灵呼唤|undead calling|小几率在周围生成僵尸或骷髅
7079
-|被动(攻击)|_未命名1_||攻击时恢复耐久 给目标施加debuff
7180
-|被动(攻击)|压制|repressing|给目标施加沉重debuff
81+
-|被动|冰冷|icy|给目标施加缓慢debuff 寒冷环境下慢慢恢复耐久 炎热环境下慢慢损失耐久

Diff for: ‎src/main/java/firok/tiths/TinkersThings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class TinkersThings
2828

2929
public static final String MOD_ID = "tiths";
3030
public static final String MOD_NAME = "Tinkers Things";
31-
public static final String VERSION = "1.12.2-0.2.20.0";
31+
public static final String VERSION = "1.12.2-0.2.21.0";
3232

3333

3434
{

Diff for: ‎src/main/java/firok/tiths/common/Blocks.java

+25-20
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import firok.tiths.block.*;
44
import firok.tiths.block.logic.BlockLogicSearing;
5+
import firok.tiths.indev.BlockOreShell;
56
import firok.tiths.util.GenMeteoWorld;
67
import firok.tiths.util.GenOreWorld;
78
import firok.tiths.util.Reg;
@@ -45,8 +46,8 @@ public class Blocks
4546
@Reg(Keys.oreRuby)
4647
@GenOreWorld(times = 5,timeRate = 0.6f,size = 4,minY = 10,maxY = 60)
4748
public static final BlockOre oreRuby = new BlockOre(Items.ruby,1,1,1,6,10); // 红宝石矿
48-
@Reg(Keys.oreShell)
49-
public static final BlockOreShell oreShell = new BlockOreShell(Items.shell,3,6,1,4,6); // 散贝壳方块
49+
// @Reg(Keys.oreShell)
50+
// public static final BlockOreShell oreShell = new BlockOreShell(Items.shell,3,6,1,4,6); // 散贝壳方块
5051
@Reg(Keys.oreCorundum)
5152
@GenOreWorld(times = 5,timeRate = 0.8f,size = 4,minY = 10,maxY = 80)
5253
public static final BlockOre oreCorundum = new BlockOre(Items.corundum,1,1,1,2,4); // 刚玉矿
@@ -142,10 +143,10 @@ public class Blocks
142143

143144
@Reg(Keys.blockStellariumObsidian)
144145
public static final Block blockStellariumObsidian = new Block(Material.ROCK); // 恒星黑曜石
145-
@Reg(Keys.blockBloodPumpkin)
146-
public static final Block blockBloodPumpkin = new Block(Material.WOOD); // 血南瓜
147-
@Reg(Keys.blockWeepingPumpkin)
148-
public static final Block blockWeepingPumpkin = new Block(Material.WOOD); // 哭泣的南瓜
146+
// @Reg(Keys.blockBloodPumpkin)
147+
// public static final Block blockBloodPumpkin = new Block(Material.WOOD); // 血南瓜
148+
// @Reg(Keys.blockWeepingPumpkin)
149+
// public static final Block blockWeepingPumpkin = new Block(Material.WOOD); // 哭泣的南瓜
149150
@Reg(Keys.blockBloodSand)
150151
public static final Block blockBloodSand = new BlockBloodSand(); // 血沙
151152
@Reg(Keys.blockConsolidatedGlass)
@@ -154,21 +155,25 @@ public class Blocks
154155
public static final Block blockCoagulatedBloodSand = new BlockCompressed(); // 凝结血沙
155156

156157
// 一些装饰用方块
157-
@Reg(Keys.blockRoyalEnchantmentTable)
158-
public static final Block blockRoyalEnchantmentTable = new BlockEnchantmentTable(){}; // todo
158+
// @Reg(Keys.blockRoyalEnchantmentTable)
159+
// public static final Block blockRoyalEnchantmentTable = new BlockEnchantmentTable(){}; // todo
159160

160161
// 植物
161-
@Reg(Keys.saplingHura)
162-
public static final Block blockSaplingHura = new BlockSapling(GenTreeHura::generate,3);
163-
@Reg(Keys.logHura)
164-
public static final Block blockLogHura = new BlockWood();
165-
@Reg(Keys.leafHura)
166-
public static final Block blockLeafHura = new BlockLeaf(blockSaplingHura,60);
162+
// @Reg(Keys.saplingHura)
163+
// public static final Block blockSaplingHura = new BlockSapling(GenTreeHura::generate,3);
164+
// @Reg(Keys.logHura)
165+
// public static final Block blockLogHura = new BlockWood();
166+
// @Reg(Keys.leafHura)
167+
// public static final Block blockLeafHura = new BlockLeaf(blockSaplingHura,60);
167168

168-
@Reg(Keys.saplingBlood)
169-
public static final Block blockSaplingBlood = new BlockSapling();
170-
@Reg(Keys.logBlood)
171-
public static final Block blockLogBlood = new BlockWood();
172-
@Reg(Keys.leafBlood)
173-
public static final Block blockLeafBlood = new BlockLeaf(blockSaplingBlood,50);
169+
// @Reg(Keys.saplingBlood)
170+
// public static final Block blockSaplingBlood = new BlockSapling();
171+
// @Reg(Keys.logBlood)
172+
// public static final Block blockLogBlood = new BlockWood();
173+
// @Reg(Keys.leafBlood)
174+
// public static final Block blockLeafBlood = new BlockLeaf(blockSaplingBlood,50);
175+
176+
// 逻辑方块
177+
// @Reg(Keys.blockLogicSearing)
178+
// public static final Block logicSearing = new BlockLogicSearing(); // 逻辑 - 焦黑窖
174179
}

Diff for: ‎src/main/java/firok/tiths/common/Craftings.java

+24-22
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public static void registerAllCraftings()
2727
registerBindings();
2828
registerBasinCastings();
2929
registerTableCastings();
30-
registerShapelessCraftings();
31-
registerShapedCraftings();
3230
}
3331

3432
// 原矿 矿块 矿锭 矿粒 之间的合成关系
@@ -58,12 +56,19 @@ private static void registerBasinCastings()
5856
RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.OBSIDIAN)),
5957
new FluidStack(Fluids.moltenStellarium, Material.VALUE_Ingot*4),
6058
true, false));
61-
// 血南瓜
59+
// // 血南瓜
60+
// registerBasinCasting(
61+
// new CastingRecipe(
62+
// new ItemStack(Blocks.blockBloodPumpkin),
63+
// RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.PUMPKIN)),
64+
// new FluidStack(TinkerFluids.blood, Material.VALUE_Ingot*8),
65+
// true, false));
66+
// 血沙
6267
registerBasinCasting(
6368
new CastingRecipe(
64-
new ItemStack(Blocks.blockBloodPumpkin),
65-
RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.PUMPKIN)),
66-
new FluidStack(TinkerFluids.blood, Material.VALUE_Ingot*8),
69+
new ItemStack(Blocks.blockBloodSand),
70+
RecipeMatch.of(new ItemStack(net.minecraft.init.Blocks.SOUL_SAND)),
71+
new FluidStack(TinkerFluids.blood, Material.VALUE_Ingot * 4),
6772
true, false));
6873
// 凝结血沙
6974
registerBasinCasting(
@@ -97,6 +102,13 @@ private static void registerTableCastings()
97102
RecipeMatch.of(new ItemStack(net.minecraft.init.Items.DYE,1,EnumDyeColor.BLACK.getDyeDamage())),
98103
new FluidStack(TinkerFluids.purpleSlime, Material.VALUE_Ingot*2),
99104
true, false));
105+
// 末影之石
106+
registerTableCasting(
107+
new CastingRecipe(
108+
new ItemStack(Items.enderGem),
109+
RecipeMatch.of(new ItemStack(net.minecraft.init.Items.ENDER_PEARL)),
110+
new FluidStack(TinkerFluids.emerald, Material.VALUE_Ingot*1),
111+
true, false));
100112
// 岩浆膏
101113
registerTableCasting(
102114
new CastingRecipe(
@@ -118,12 +130,12 @@ private static void registerTableCastings()
118130
true, false));
119131

120132
// 奢华纸张
121-
registerTableCasting(
122-
new CastingRecipe(
123-
new ItemStack(Items.royalPaper),
124-
RecipeMatch.of(new ItemStack(net.minecraft.init.Items.PAPER)),
125-
new FluidStack(Fluids.moltenRoyalAlloy, Material.VALUE_Nugget*1),
126-
true, false));
133+
// registerTableCasting(
134+
// new CastingRecipe(
135+
// new ItemStack(Items.royalPaper),
136+
// RecipeMatch.of(new ItemStack(net.minecraft.init.Items.PAPER)),
137+
// new FluidStack(Fluids.moltenRoyalAlloy, Material.VALUE_Nugget*1),
138+
// true, false));
127139

128140
// 灼热面包
129141
registerTableCasting(
@@ -140,16 +152,6 @@ private static void registerTableCastings()
140152
new FluidStack(FluidRegistry.LAVA, Material.VALUE_Nugget*1),
141153
true, false));
142154
}
143-
// 无序合成
144-
private static void registerShapelessCraftings()
145-
{
146-
// 哭泣南瓜
147-
}
148-
// 有序合成
149-
private static void registerShapedCraftings()
150-
{
151-
;
152-
}
153155

154156
private static void createBinding(
155157
Block ore,Block block,Fluid fluid,

Diff for: ‎src/main/java/firok/tiths/common/Events.java

+63-2
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,28 @@
33

44
import net.minecraft.block.Block;
55
import net.minecraft.entity.Entity;
6+
import net.minecraft.entity.EntityLivingBase;
67
import net.minecraft.entity.item.EntityItem;
8+
import net.minecraft.entity.monster.EntityCaveSpider;
9+
import net.minecraft.entity.monster.EntitySpider;
710
import net.minecraft.entity.player.EntityPlayer;
11+
import net.minecraft.init.Biomes;
812
import net.minecraft.init.Blocks;
913
import net.minecraft.item.ItemStack;
1014
import net.minecraft.util.EnumHand;
1115
import net.minecraft.util.math.BlockPos;
1216
import net.minecraft.world.World;
17+
import net.minecraft.world.biome.Biome;
18+
import net.minecraftforge.event.entity.living.LivingDeathEvent;
1319
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
1420
import net.minecraftforge.event.world.BlockEvent;
1521
import net.minecraftforge.fml.common.Mod;
1622
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1723

24+
import java.util.Random;
25+
1826
import static firok.tiths.traits.TraitStonePhasing.costStone;
27+
import static firok.tiths.util.Predicates.canTrigger;
1928

2029
@Mod.EventBusSubscriber
2130
public class Events
@@ -24,20 +33,72 @@ public class Events
2433
public static void onBlockBroken(BlockEvent.BreakEvent event)
2534
{
2635
World world=event.getWorld();
27-
if(world.isRemote) return;
36+
if(world.isRemote) return; // 只在服务端执行
37+
2838
BlockPos pos=event.getPos();
2939
Block block=world.getBlockState(pos).getBlock();
30-
if(block== Blocks.ICE)
40+
41+
// 碎冰
42+
TRY_DROP_BROKEN_ICE:if(block== Blocks.ICE)
3143
{
3244
int amount=1+world.rand.nextInt(6);
3345
ItemStack stack=new ItemStack(Items.brokenIce,amount);
3446
EntityItem ei=new EntityItem(world,pos.getX(),pos.getY(),pos.getZ(),stack);
3547

3648
world.spawnEntity(ei); // spawn broken ice
49+
break TRY_DROP_BROKEN_ICE;
3750
}
51+
// 贝壳
52+
else TRY_DROP_SHELL:if(block== Blocks.SAND)
53+
{
54+
if(!canTrigger(world,0.28f)) break TRY_DROP_SHELL;
3855

56+
Biome biome=world.getBiome(pos);
57+
if(biome== Biomes.BEACH ||
58+
biome==Biomes.COLD_BEACH ||
59+
biome==Biomes.OCEAN ||
60+
biome==Biomes.DEEP_OCEAN
61+
){
62+
int amount= 1+ world.rand.nextInt(2);
63+
ItemStack stack=new ItemStack(Items.shell,amount);
64+
EntityItem ei=new EntityItem(world,pos.getX(),pos.getY(),pos.getZ(),stack);
65+
world.spawnEntity(ei);
66+
}
67+
break TRY_DROP_SHELL;
68+
}
3969
}
4070

71+
@SubscribeEvent
72+
public static void onEntityDead(LivingDeathEvent event)
73+
{
74+
EntityLivingBase living=event.getEntityLiving();
75+
World world=living.world;
76+
if(world.isRemote) return;
77+
Random rand=world.rand;
78+
79+
ItemStack stack2drop=null;
80+
if(living instanceof EntityCaveSpider) // 洞穴蜘蛛
81+
{
82+
if(canTrigger(rand,0.35f))
83+
{
84+
stack2drop=new ItemStack(Items.spiderLeg,1+rand.nextInt(2));
85+
}
86+
}
87+
else if(living instanceof EntitySpider) // 蜘蛛
88+
{
89+
if(canTrigger(rand,0.45f))
90+
{
91+
stack2drop=new ItemStack(canTrigger(rand,0.3f)?Items.hardSpiderLeg:Items.spiderLeg,1+rand.nextInt(1));
92+
}
93+
}
94+
95+
// 掉落物品
96+
if(stack2drop!=null)
97+
{
98+
EntityItem ei=new EntityItem(world,living.posX,living.posY,living.posZ,stack2drop);
99+
world.spawnEntity(ei);
100+
}
101+
}
41102

42103
@SubscribeEvent
43104
public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event)

Diff for: ‎src/main/java/firok/tiths/common/Fluids.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package firok.tiths.common;
22

3+
import firok.tiths.util.RegSmelteryFuel;
34
import net.minecraft.util.ResourceLocation;
45
import slimeknights.tconstruct.library.fluid.FluidMolten;
56

@@ -9,6 +10,7 @@
910
public class Fluids
1011
{
1112
public static final FluidMolten moltenRoyalAlloy=$(nameRoyalAlloy, colorRoyalAlloy);
13+
@RegSmelteryFuel(amount=10,duration=400)
1214
public static final FluidMolten moltenStellarium=$(nameStellarium, colorStellarium);
1315
public static final FluidMolten moltenHothium=$(nameHothium, colorHothium);
1416
public static final FluidMolten moltenCinnabar=$(nameCinnabar, colorCinnabar);
@@ -35,10 +37,10 @@ public class Fluids
3537
new ResourceLocation("tconstruct:blocks/fluids/molten_metal"),
3638
new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow")
3739
);
38-
fluid.setTemperature(temp);
39-
fluid.setLuminosity(lumen);
40-
fluid.setViscosity(visc);
41-
fluid.setDensity(dens);
40+
fluid.setTemperature(temp); // 温度
41+
fluid.setLuminosity(lumen); // 亮度
42+
fluid.setViscosity(visc); // 黏度
43+
fluid.setDensity(dens); // 密度
4244
return fluid;
4345
}
4446
}

0 commit comments

Comments
 (0)