feat: обновлена мота & добавлены зжииидкости

- Добавлена поддержка зжииидкости
- Исправлена ошибка иза которой не работало создание блока с кастум классом
- Отключен зимний эффект
- Обновлён Nukkit-mot
This commit is contained in:
Reider745
2024-01-03 19:22:24 +03:00
parent 7224f7a140
commit b86d2b3abe
5 changed files with 131 additions and 7 deletions
Binary file not shown.
+1 -1
View File
@@ -75,7 +75,7 @@ public class Main {
loader.registerHooksInitializationForClass(LevelHooks.class);
loader.registerHooksInitializationForClass(ItemUtils.class);
loader.registerHooksInitializationForClass(AndroidHooks.class);
loader.registerHooksInitializationForClass(SnowfallEverywhere.class);
//loader.registerHooksInitializationForClass(SnowfallEverywhere.class);
//loader.registerHooksInitializationForClass(BiomesHooks.class);
loader.registerHooksInitializationForClass(GlobalBanList.class);
@@ -13,6 +13,8 @@ import com.zhekasmirnov.innercore.api.NativeCallback;
import com.zhekasmirnov.innercore.api.NativeItem;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -65,10 +67,15 @@ public class CustomBlock extends BlockSolidMeta implements RandomTick {
public static void init(){
blocks.forEach((id, value) -> {
CustomManager manager = getBlockManager(id);
ArrayList<String> variants = getVariants(manager);
for(int data = 0;data < variants.size();data++)
registerBlock(id, data, new CustomBlock(id, data, manager, variants.get(data)));
final CustomManager manager = getBlockManager(id);
final ArrayList<String> variants = getVariants(manager);
try {
final Constructor<?> constructor = manager.getClazz().getDeclaredConstructor(int.class, int.class, CustomManager.class, String.class);
for(int data = 0;data < variants.size();data++)
registerBlock(id, data, (Block) constructor.newInstance(id, data, manager, variants.get(data)));
} catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
throw new RuntimeException(e);
}
});
}
@@ -121,6 +128,13 @@ public class CustomBlock extends BlockSolidMeta implements RandomTick {
return registerBlock(textId, id, name, CustomBlock.class);
}
public static CustomManager registerBlock(String textId, int id, String name, int tick_rate, boolean isRenewable){
CustomManager manager = registerBlock(textId, id, name, CustomBlockLiquid.class);
manager.put("tick_rate", tick_rate);
manager.put("isRenewable", isRenewable);
return manager;
}
private CustomManager manager;
private int id;
private String name;
@@ -0,0 +1,109 @@
package com.reider745.block;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockLiquid;
import cn.nukkit.block.BlockWater;
import cn.nukkit.event.redstone.RedstoneUpdateEvent;
import cn.nukkit.item.Item;
import cn.nukkit.item.ItemTool;
import cn.nukkit.level.Level;
import cn.nukkit.math.BlockFace;
import com.reider745.api.CustomManager;
import com.zhekasmirnov.innercore.api.NativeCallback;
import org.jetbrains.annotations.NotNull;
public class CustomBlockLiquid extends BlockLiquid implements RandomTick {
private CustomManager manager;
private int id, tick_rate;
private String name;
private boolean TickingTile;
private boolean NeighbourChange, isRenewable;
protected CustomBlockLiquid(int id, int meta){
this(id, meta, CustomBlock.getBlockManager(id));
}
protected CustomBlockLiquid(int id, int meta, CustomManager manager) {
this(id, meta, manager, "blank");
}
protected CustomBlockLiquid(int id, int meta, CustomManager manager, String name) {
super(meta);
this.manager = manager;
this.id = id;
this.name = name;
TickingTile = manager.get("TickingTile:"+meta, false);
NeighbourChange = manager.get("NeighbourChange", false);
tick_rate = manager.get("tick_rate", 5);
isRenewable = manager.get("isRenewable", false);
}
@Override
public int tickRate() {
return tick_rate;
}
@Override
public boolean usesWaterLogging() {
return false;
}
@Override
public int getToolTier() {
return 0;
}
@Override
public boolean canRandomTickBlocks() {
return TickingTile;
}
@Override
public String getName() {
return name;
}
@Override
public int getId() {
return id;
}
@Override
public int getToolType() {
return ItemTool.TYPE_PICKAXE;
}
@Override
public Item[] getDrops(Item item) {
return new Item[]{Item.get(id, this.getDamage(), 1)};
}
@Override
public int onUpdate(int type) {
return super.onUpdate(type);
}
@Override
public int getItemId() {
return id;
}
@Override
public Block clone() {
CustomBlockLiquid customBlock = (CustomBlockLiquid) super.clone();
customBlock.id = id;
customBlock.name = name;
customBlock.manager = manager;
customBlock.setDamage(getDamage());
return customBlock;
}
@Override
public BlockLiquid getBlock(int meta) {
return (BlockLiquid) Block.get(id, meta);
}
}
@@ -4,6 +4,7 @@ import com.reider745.InnerCoreServer;
import com.reider745.api.CustomManager;
import com.reider745.block.BlockMethods;
import com.reider745.block.CustomBlock;
import com.reider745.block.CustomBlockLiquid;
import com.zhekasmirnov.apparatus.ecs.ECS;
import com.zhekasmirnov.apparatus.ecs.core.ComponentCollection;
import com.zhekasmirnov.apparatus.ecs.core.EntityManager;
@@ -70,8 +71,8 @@ public class NativeBlock {
public static NativeBlock[] createLiquidBlock(int id1, String nameId1, int id2, String nameId2, String name,
int materialBase, int tickDelay, boolean isRenewable) {
name = NameTranslation.fixUnicodeIfRequired("block." + nameId1, name);
CustomManager liquidStill = CustomBlock.registerBlock(nameId1, id1, name);
CustomManager liquidFlowing = CustomBlock.registerBlock(nameId2, id2, name);
CustomManager liquidStill = CustomBlock.registerBlock(nameId1, id1, name, tickDelay, isRenewable);
CustomManager liquidFlowing = CustomBlock.registerBlock(nameId2, id2, name, tickDelay, isRenewable);
return new NativeBlock[] { new NativeBlock(liquidStill, id1, nameId1, name),
new NativeBlock(liquidFlowing, id2, nameId2, name) };
}