simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-20 02:56:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
simon 2018-12-23 12:47:38 -05:00
commit 7fd1c35f7a
8 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugin Cubot/Plugin Cubot.iml
View File

@ -17,6 +17,9 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="module" module-name="Server" /> <orderEntry type="module" module-name="Server" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />

2
Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java
View File

@ -108,8 +108,8 @@ public class CubotLidar extends HardwareModule {
//Write map data to the location specified by register X //Write map data to the location specified by register X
int i = getCpu().getRegisterSet().getRegister("X").getValue(); int i = getCpu().getRegisterSet().getRegister("X").getValue();
for (int x = 0; x < unit.getWorld().getWorldSize(); x++) {
for (int y = 0; y < unit.getWorld().getWorldSize(); y++) { for (int y = 0; y < unit.getWorld().getWorldSize(); y++) {
for (int x = 0; x < unit.getWorld().getWorldSize(); x++) {
getCpu().getMemory().set(i++, mapInfo[x][y]); getCpu().getMemory().set(i++, mapInfo[x][y]);
} }
} }

3
Plugin Misc HW/Plugin Misc HW.iml
View File

@ -16,6 +16,9 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="module" module-name="Server" /> <orderEntry type="module" module-name="Server" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />

3
Plugin NPC/Plugin NPC.iml
View File

@ -16,6 +16,9 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.10" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

3
Plugin Plant/Plugin Plant.iml
View File

@ -16,6 +16,9 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.10" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

3
Server/Server.iml
View File

@ -16,6 +16,9 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />

2
Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java
View File

@ -19,7 +19,7 @@ public class TerrainRequestHandler implements MessageHandler {
try { try {
world = GameServer.INSTANCE.getGameUniverse().getWorld( world = GameServer.INSTANCE.getGameUniverse().getWorld(
Long.valueOf((long) json.get("x")).intValue(), Long.valueOf((long) json.get("x")).intValue(),
Long.valueOf((long) json.get("y")).intValue(), true, Long.valueOf((long) json.get("y")).intValue(), false,
(String) json.get("dimension")); (String) json.get("dimension"));
} catch (NullPointerException e) { } catch (NullPointerException e) {
LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler"); LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");

6
Server/src/main/resources/config.properties
View File

@ -40,7 +40,7 @@ wg_maxCopperCount=2
wg_fluidCenterPointMin=0 wg_fluidCenterPointMin=0
wg_fluidCenterPointMax=2 wg_fluidCenterPointMax=2
#CPU #CPU
tick_length=50 tick_length=1000
org_offset=512 org_offset=512
stack_bottom=65536 stack_bottom=65536
memory_size=65536 memory_size=65536
@ -66,13 +66,13 @@ shield_energy_cost=50
npc_lifetime=1024 npc_lifetime=1024
npc_max_factory_distance=3 npc_max_factory_distance=3
factory_max_npc_count=16 factory_max_npc_count=16
factory_program_size=1024 factory_program_size=2048
settlement_spawn_rate=35 settlement_spawn_rate=35
harvester_hp_max=100 harvester_hp_max=100
harvester_regen=5 harvester_regen=5
harvester_biomass_drop_count=8 harvester_biomass_drop_count=8
radio_tower_range=3 radio_tower_range=3
hacked_npc_mem_size=5120 hacked_npc_mem_size=8192
npc_exec_time=5 npc_exec_time=5
hacked_npc_die_on_no_energy=1 hacked_npc_die_on_no_energy=1
#Vaults #Vaults