TheBrokenRail/ScriptCraft
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve Method Names
All checks were successful
ScriptCraft/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
TheBrokenRail 2020-04-27 14:22:07 -04:00
parent 90d93dd6d6
commit 8f7a04e12c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/scriptcraft/minecraft/block.ts
View File

@ -256,11 +256,11 @@ export class BlockRegistry implements SimpleRegistry<CustomBlock> {
return null; return null;
} }
getBlockEntity(id: Identifier, i: number): CustomBlockEntity { getCustomBlockEntity(id: Identifier, i: number): CustomBlockEntity {
return this.#blockEntities.get(id.toString())[i]; return this.#blockEntities.get(id.toString())[i];
} }
getBlockEntities(): CustomBlockEntity[] { getCustomBlockEntities(): CustomBlockEntity[] {
let out: CustomBlockEntity[] = []; let out: CustomBlockEntity[] = [];
for (const key of this.#blockEntities.keys()) { for (const key of this.#blockEntities.keys()) {
const list = this.#blockEntities.get(key); const list = this.#blockEntities.get(key);
@ -269,7 +269,7 @@ export class BlockRegistry implements SimpleRegistry<CustomBlock> {
return out; return out;
} }
createBlockEntity(id: Identifier, i: number) { createCustomBlockEntity(id: Identifier, i: number) {
const block = this.get(id) as CustomBlockWithEntity; const block = this.get(id) as CustomBlockWithEntity;
if (!this.#blockEntities.get(id.toString())) { if (!this.#blockEntities.get(id.toString())) {
this.#blockEntities.set(id.toString(), []); this.#blockEntities.set(id.toString(), []);
@ -277,33 +277,33 @@ export class BlockRegistry implements SimpleRegistry<CustomBlock> {
this.#blockEntities.get(id.toString()).push(block.createBlockEntity()); this.#blockEntities.get(id.toString()).push(block.createBlockEntity());
} }
freeBlockEntity(id: Identifier, i: number) { freeCustomBlockEntity(id: Identifier, i: number) {
delete this.#blockEntities.get(id.toString())[i]; delete this.#blockEntities.get(id.toString())[i];
} }
} }
addBridge('CustomBlockEntity.create', (id: string, i: number) => { addBridge('CustomBlockEntity.create', (id: string, i: number) => {
BlockRegistry.INSTANCE.createBlockEntity(new Identifier(id), i); BlockRegistry.INSTANCE.createCustomBlockEntity(new Identifier(id), i);
}); });
addBridge('CustomBlockEntity.fromTag', (id: string, i: number, tag: JavaObject) => { addBridge('CustomBlockEntity.fromTag', (id: string, i: number, tag: JavaObject) => {
BlockRegistry.INSTANCE.getBlockEntity(new Identifier(id), i).fromTag(new CompoundTag(tag)); BlockRegistry.INSTANCE.getCustomBlockEntity(new Identifier(id), i).fromTag(new CompoundTag(tag));
}); });
addBridge('CustomBlockEntity.toTag', (id: string, i: number, tag: JavaObject): JavaObject => { addBridge('CustomBlockEntity.toTag', (id: string, i: number, tag: JavaObject): JavaObject => {
return BlockRegistry.INSTANCE.getBlockEntity(new Identifier(id), i).toTag(new CompoundTag(tag)).javaObject; return BlockRegistry.INSTANCE.getCustomBlockEntity(new Identifier(id), i).toTag(new CompoundTag(tag)).javaObject;
}); });
addBridge('CustomBlockEntity.tick', (id: string, i: number) => { addBridge('CustomBlockEntity.tick', (id: string, i: number) => {
BlockRegistry.INSTANCE.getBlockEntity(new Identifier(id), i).tick(); BlockRegistry.INSTANCE.getCustomBlockEntity(new Identifier(id), i).tick();
}); });
addBridge('CustomBlockEntity.setLocation', (id: string, i: number, world: JavaObject, x: number, y: number, z: number) => { addBridge('CustomBlockEntity.setLocation', (id: string, i: number, world: JavaObject, x: number, y: number, z: number) => {
BlockRegistry.INSTANCE.getBlockEntity(new Identifier(id), i).setLocation(new World(world), new Pos(x, y, z)); BlockRegistry.INSTANCE.getCustomBlockEntity(new Identifier(id), i).setLocation(new World(world), new Pos(x, y, z));
}); });
addBridge('CustomBlockEntity.free', (id: string, i: number) => { addBridge('CustomBlockEntity.free', (id: string, i: number) => {
BlockRegistry.INSTANCE.freeBlockEntity(new Identifier(id), i); BlockRegistry.INSTANCE.freeCustomBlockEntity(new Identifier(id), i);
}); });
addBridge('CustomBlock.onUse', (id: string, world: JavaObject, state: JavaObject, x: number, y: number, z: number, side: keyof typeof Direction, player: JavaObject, hand: keyof typeof Hand): string => { addBridge('CustomBlock.onUse', (id: string, world: JavaObject, state: JavaObject, x: number, y: number, z: number, side: keyof typeof Direction, player: JavaObject, hand: keyof typeof Hand): string => {

2
src/main/resources/scriptcraft/minecraft/world.ts
View File

@ -60,7 +60,7 @@ export class World {
* @internal * @internal
*/ */
private getCustomBlockEntities(): CustomBlockEntity[] { private getCustomBlockEntities(): CustomBlockEntity[] {
return BlockRegistry.INSTANCE.getBlockEntities(); return BlockRegistry.INSTANCE.getCustomBlockEntities();
} }
/** /**