SteamWar/BauSystem
Archiviert
13
0
Commit graph

524 Commits

Autor SHA1 Nachricht Datum
jojo
dfb6770453 Fix Freeze Exceptions 2021-02-04 09:55:39 +01:00
Chaoscaot
032a4c75d6 Adding and Fixing more Stuff 2021-02-03 23:52:23 +01:00
Chaoscaot
f00d8324d6 Merge branch 'master' into ChaosBauGUI 2021-02-03 21:22:40 +01:00
jojo
cf7ae0fa09 Optimize Imports 2021-02-03 21:10:59 +01:00
jojo
97d626fcb3 Simplify RegionSystem 2021-02-03 21:08:59 +01:00
Chaoscaot
886cf5607d New Region System 2021-02-03 21:01:21 +01:00
jojo
828fb025aa Simplify RegionSystem 2021-02-03 21:00:22 +01:00
Chaoscaot
a7df81aca5 Merge branch 'master' into ChaosBauGUI
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/Region.java
2021-02-03 20:35:48 +01:00
Chaoscaot
9b70227f74 Merge branch 'master' into edit-signs 2021-02-03 20:15:31 +01:00
Chaoscaot
0b95df4bda Expanding Inventory 2021-02-03 20:14:52 +01:00
jojo
7cb2f224a2 Fix freeze allow building of tnt 2021-02-03 20:07:40 +01:00
jojo
5c73e5874d Fix Sound of TNT ignite with freeze enabled 2021-02-03 19:41:00 +01:00
jojo
375885bbde Fix Sound of TNT ignite with freeze enabled 2021-02-03 19:37:52 +01:00
jojo
475f93426c Simplify CommandTNT for Region without Testblock 2021-02-03 18:09:16 +01:00
jojo
d406ed7e66 Fix CommandTNT for Region without Testblock 2021-02-03 18:06:30 +01:00
jojo
f977837175 Simplify TNTSimulator.start 2021-02-03 16:53:37 +01:00
jojo
4648186c1a Fix pr stuff 2021-02-03 15:39:06 +01:00
jojo
168819e5c8 Fix pr stuff 2021-02-03 15:38:12 +01:00
jojo
16ad0ad5e6 Optimize Imports 2021-02-03 14:31:24 +01:00
jojo
7b4c0681d0 Fix copyright 2021-02-03 14:30:59 +01:00
jojo
911385a5af Merge branch 'master' into RegionSystem
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
2021-02-03 14:03:47 +01:00
jojo
709e6f11dc Fix tnt spawning on redstone sources 2021-02-03 11:13:33 +01:00
jojo
88b9ae0ec4 Fix tnt spawning on redstone sources 2021-02-03 11:12:27 +01:00
Chaoscaot
080d810bc4 First Prototype of ChaosBauGUI 2021-02-02 23:44:46 +01:00
Chaoscaot
faf31bc883 Add 1.12 Support 2021-02-02 14:59:41 +01:00
Chaoscaot
7a89347248 Fixing and Editing 2021-02-01 15:06:22 +01:00
Chaoscaot
6376ef7dd5 Add Shift + Right Click Edit Sign 2021-02-01 13:42:19 +01:00
jojo
4f1307cc8d Fix pr stuff 2021-01-31 13:29:39 +01:00
jojo
440717f1f5 Add ShowModeParameter 'advanced' 2021-01-30 11:22:43 +01:00
jojo
a219bfc7b0 Simplify TNTSimulator 2021-01-28 10:40:33 +01:00
jojo
c7584cd952 Fix pr stuff 2021-01-27 15:26:06 +01:00
jojo
7f55dddd8f Add '-a' as alias for '-advanced' to ShowModeParameter parsing 2021-01-27 13:56:40 +01:00
jojo
1a72a39b33 Merge Basic ShowMode and Advanced ShowMode to EntityShowMode
Add EntityShowMode
2021-01-27 13:53:35 +01:00
0657f74d9d Merge pull request 'Add TraceGUI' (#161) from TraceGui into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-27 10:06:30 +01:00
jojo
7be5700359 Fix merge conflicts 2021-01-27 09:51:14 +01:00
jojo
200926d41d Fix merge conflicts 2021-01-27 09:50:41 +01:00
jojo
24e1541281 Merge branch 'master' into RegionSystem 2021-01-27 09:50:21 +01:00
jojo
28b818f799 Fix pr stuff 2021-01-26 15:22:53 +01:00
jojo
96be3d5259 Merge branch 'master' into TraceGui 2021-01-26 15:21:44 +01:00
jojo
d66c102c2e Fix CommandFreeze for entity spawning and redstone ore activation 2021-01-26 14:51:59 +01:00
jojo
41c5b3dd55 Rename GuiTraceShow inventory name 2021-01-26 12:06:01 +01:00
jojo
2d068abe32 Remove Redstone ore activation while freezed 2021-01-26 11:20:42 +01:00
jojo
fc275166cb Simplify math expressions 2021-01-26 10:58:12 +01:00
jojo
8bb76d656f Remove unused fields 2021-01-26 10:31:55 +01:00
jojo
55c5c3bda5 Remove unused fields 2021-01-26 10:25:36 +01:00
jojo
47e268fb54 Optimize Imports 2021-01-26 10:24:57 +01:00
jojo
56402bb012 Optimize CommandTPSLimiter with accuracy 2021-01-26 10:23:51 +01:00
jojo
ddcbec834e Fix last stuff 2021-01-25 17:37:21 +01:00
jojo
e0e3eb2a84 Merge branch 'master' into RegionSystem 2021-01-25 17:25:43 +01:00
jojo
1ddc58d1fb Hotfix ScriptListener Script Book check 2021-01-25 17:22:22 +01:00
jojo
90d0063465 Add other region to toggleable 2021-01-25 17:10:45 +01:00
jojo
4268647057 Fix CommandInfo 2021-01-25 16:41:42 +01:00
jojo
041741bc75 Fix CommandTNT
Fix RegionToggleCommand
2021-01-25 16:39:21 +01:00
jojo
ea345fb46c Add Region section Support for /tnt /fire /freeze 2021-01-25 14:32:52 +01:00
jojo
093ab5802e Add TNTMode to ONLY_TB 2021-01-24 21:15:19 +01:00
jojo
4e4a1eb3e8 Add TNTMode to ONLY_TB 2021-01-24 21:12:36 +01:00
jojo
f887e633ad Add CommandTNT by Region.buildAreaEnabled() 2021-01-24 20:07:19 +01:00
jojo
76359c9c38 Merge branch 'master' into TntMode 2021-01-24 17:13:08 +01:00
jojo
7871a88824 Add CommandTNT by Region.buildAreaEnabled() 2021-01-24 17:02:34 +01:00
bd8a34dd15 Fixing region size 2021-01-24 14:58:58 +01:00
jojo
f04bf70087 Fix Build issues 2021-01-24 14:50:19 +01:00
jojo
6c030c1f9d Remove TNTSimulatorAnvil.java 2021-01-22 16:35:40 +01:00
jojo
36a601a610 Fix PR stuff 2021-01-22 16:13:32 +01:00
jojo
84686357c5 Fix PR stuff 2021-01-22 14:02:01 +01:00
jojo
ae6d5ee671 Fix PR stuff 2021-01-22 13:58:02 +01:00
jojo
cc929b88a7 Add TNTSimulator 0tick simulation capabilities 2021-01-20 23:42:04 +01:00
jojo
9373fe21f7 Fix TNTSimulatorListener permission check 2021-01-20 21:06:32 +01:00
jojo
8ccb282e17 Fix TNTSimulator name 2021-01-20 21:04:47 +01:00
jojo
9bb234bf32 Fix Region.Prototype.SECTION_PATH 2021-01-20 21:03:04 +01:00
jojo
99ed270424 Fix TNT naming 2021-01-20 20:32:53 +01:00
jojo
43b9068415 Fix TNT naming 2021-01-20 20:31:26 +01:00
jojo
12ed389ae3 Add TNTSpawn naming 2021-01-20 20:30:24 +01:00
jojo
bbdf02594b Add TNTSpawn naming 2021-01-20 20:28:45 +01:00
jojo
38b545483a Fix PR stuff 2021-01-20 19:01:52 +01:00
jojo
870fc285e7 Fix PR stuff 2021-01-20 18:55:13 +01:00
jojo
28b3733b83 Simplify CommandTNT 2021-01-20 18:18:18 +01:00
jojo
b5f0dde9d1 Optimize TNTSimulator 2021-01-20 17:53:05 +01:00
jojo
e127144223 Add CommandSimulator.permissionCheck 2021-01-20 17:51:44 +01:00
jojo
d5ed63f938 Add TNTSimulator.LORE 2021-01-20 17:37:05 +01:00
jojo
1942a2c355 Add TNTSimulator.WAND
Add TNTSimulatorListener
Add CommandSimulatorTabCompleter
Add TNTSimulatorAnvil
2021-01-20 17:24:15 +01:00
jojo
7a8c3f20f1 Fix TNTSet error
Add TNTSpawn.fuseTicks
2021-01-20 16:10:07 +01:00
jojo
a23608b171 Add TNTSimulator 2021-01-20 15:26:35 +01:00
jojo
0be031f5fe Add CommandBuildMode 2021-01-20 11:25:34 +01:00
jojo
3d57e56396 Fix CommandTestblock 2021-01-20 11:05:33 +01:00
jojo
a22e1d37b9 Add CommandBuildMode 2021-01-20 11:04:46 +01:00
jojo
b5b0cbf35e Fix Region with null testblock 2021-01-20 10:33:18 +01:00
jojo
1afa2b9242 Fix Advanced Trace mode 2021-01-16 18:33:51 +01:00
jojo
c4867658a6 Fix issue with ShowModeParameter 2021-01-16 18:20:57 +01:00
cbc8a919a6 Hotfix region bug 2021-01-16 09:11:06 +01:00
df63358d8f Merge branch 'bauconfigRefactoring' 2021-01-16 08:59:04 +01:00
jojo
0a49448778 Add TraceGUI 2021-01-15 17:29:15 +01:00
675363b545 Merge pull request 'Dont show tnt exploded in water without -water option' (#160) from tracerWaterExploded into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-01-15 17:21:54 +01:00
jojo
dfaa04d0c4 Merge remote-tracking branch 'origin/master' 2021-01-11 17:17:46 +01:00
jojo
8270b7c0d3 Hotfix NPE 2021-01-11 17:17:26 +01:00
d1883d4b85 Dont show tnt exploded in water without -water option 2021-01-10 12:48:42 +01:00
230de54cbf Merge pull request 'Fixing Loader String Double Activation' (#159) from loader_string_interaction into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-01-09 20:55:20 +01:00
8b1d8e5d40 Merge pull request 'Fixing Detonator' (#158) from fixing_some_detonator into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-01-09 20:54:36 +01:00
Chaoscaot
fb7b9ae393 Error 404 Changeset Unknown 2021-01-09 20:53:26 +01:00
jojo
ac35ae2a47 Hotfix ScriptListener 2021-01-09 20:43:53 +01:00
bc3174174e Merge pull request 'Script Turing Completeness' (#152) from ScriptBranches into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-01-09 20:40:15 +01:00
jojo
3af3ef5fdd Fix CommandScript 2021-01-09 20:33:54 +01:00
Chaoscaot
6fe246b230 Fix Regions 2021-01-06 13:48:36 +01:00
Chaoscaot
d20cda08ce Changes 2021-01-05 17:46:00 +01:00
Chaoscaot
9150a3a4c7 Changes 2021-01-05 17:36:57 +01:00
Chaoscaot
94cb735bd4 Changes 2021-01-05 17:18:58 +01:00
Chaoscaot
7e9fb81faa Fixing Loader String Double Activation 2021-01-05 16:44:40 +01:00
Chaoscaot
b6b92c4be9 Fixing Loader String Double Activation 2021-01-05 16:13:37 +01:00
Chaoscaot
b69c7dda16 Fixing even even more Things 2021-01-05 13:31:40 +01:00
Chaoscaot
09ba3a091b Fixing even more Things 2021-01-05 13:31:07 +01:00
Chaoscaot
9fd1efb610 Fixing some more Things 2021-01-05 13:15:37 +01:00
Chaoscaot
b1672be384 Fixing some Things 2021-01-05 13:13:05 +01:00
Chaoscaot
2a1e4578d6 Fixing Detonator 2021-01-05 03:06:27 +01:00
jojo
ffd080411f Add Inventory click support 2021-01-04 20:28:23 +01:00
jojo
2770006c0e Fix Typos in Documentation Book 2021-01-03 12:26:31 +01:00
jojo
dd6d513198 Fix Item name 2021-01-02 17:39:42 +01:00
jojo
04151e44b0 Fix Book Author 2021-01-02 17:30:07 +01:00
jojo
eedc6f3e80 Add Script Documentation in CommandScript 2021-01-02 17:24:25 +01:00
81bbc84fd8 Fix post clear behaviour 2021-01-01 13:20:28 +01:00
jojo
d04032cd66 Add CommandScript 2020-12-30 12:13:14 +01:00
jojo
fec21c9a92 Add Execution Points back 2020-12-30 11:48:38 +01:00
jojo
570de88059 Add variable replacing for every command 2020-12-29 21:24:58 +01:00
jojo
a8e6edefb8 Simplify ScriptListener 2020-12-29 20:28:57 +01:00
jojo
bc898c57c3 Bum Fix 2020-12-27 22:32:03 +01:00
d26b7f4393 Merge pull request 'Tracer-entity' (#147) from Tracer-entity into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-27 22:16:02 +01:00
jojo
8d8d9bc1fb Fix CommandTrace 2020-12-27 22:08:34 +01:00
jojo
c32702fce9 Add '/trace show' options to help 2020-12-27 22:08:10 +01:00
jojo
b8672a9134 Use RecordStatus only in '/trace auto' only 2020-12-27 22:02:18 +01:00
jojo
30a0cea0f4 Use RecordStatus only in '/trace auto' only 2020-12-27 22:01:31 +01:00
jojo
a19e0436fb Add ShowMode arguments with ShowModeParameter 2020-12-27 15:34:00 +01:00
jojo
df00896c93 Optimize TraceEntity_12
Optimize TraceEntity_15
Optimize CommandTraceTabCompleter
Optimize Recorder
2020-12-27 14:19:58 +01:00
jojo
6b23f88ea0 Optimize Packets in TraceEntity_12 and TraceEntity_15
Simplify messages in CommandTrace
2020-12-27 13:47:43 +01:00
jojo
e4f874a4bb Optimize Code
Add Version Dependant Call for water check
Remove TraceShowManager argument parsing
Remove ReflectionUtils.java
Remove BauSystem comments
Move RoundedTNTPosition
Move TNTPosition
Fix Advanced
Simplify Basic.createEntity
2020-12-27 00:13:20 +01:00
fdd74296b8 Merge pull request 'FallingBlock' (#144) from FallingBlock into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-26 23:21:21 +01:00
jojo
c54980399a Remove UpdateEntity_12.java
Remove UpdateEntity_15.java
Simplify TraceEntity_12
Simplify TraceEntity_15
2020-12-26 23:11:08 +01:00
jojo
d316b606fd Optimize Imports 2020-12-26 22:41:00 +01:00
jojo
500d103b49 Update versioned dependant code to new SpigotCore version dependant calls 2020-12-25 23:28:11 +01:00
jojo
f8d69deaa3 Update versioned dependant code to new SpigotCore version dependant calls 2020-12-25 23:25:09 +01:00
jojo
d332977a1d Fix Trace auto messages 2020-12-25 23:08:59 +01:00
jojo
8f35724d72 Simplify TNTTracer_12 and TNTTracer_15
Simplify TraceEntity_12 and TraceEntity_15
Simplify UpdateEntity_12 and UpdateEntity_15
Add TNTPosition.previousLocation
Fix CommandTrace messages for argument 'auto'
Remove Experimental
2020-12-25 23:01:08 +01:00
jojo
2a796d710f Add Recorder record first position 2020-12-25 22:35:35 +01:00
jojo
0864b1bc92 Add Experimental 2020-12-25 22:26:35 +01:00
jojo
dee5d9598d Fix Advanced Tracer 2020-12-25 21:58:55 +01:00
jojo
62d223b470 Simplify TNTPosition 2020-12-25 18:49:35 +01:00
jojo
65456ea19c Simplify TPSLimit_12
Simplify TPSLimit_15
2020-12-25 18:06:19 +01:00
jojo
5a881be746 Simplify Advanced 2020-12-25 13:32:10 +01:00
jojo
f554f595f8 Optimize Imports 2020-12-25 13:25:43 +01:00
jojo
0ffafaf95c Fix CommandTraceTabCompleter 2020-12-25 13:02:43 +01:00
jojo
7798ddc5d7 Remove Logging Messages 2020-12-25 13:00:07 +01:00
jojo
79ee799260 Add CommandTrace messages 2020-12-25 12:59:39 +01:00
jojo
3f040e6130 Add Advanced
Add AdvancedNoWater
Add RoundedTNTPosition
2020-12-25 12:57:50 +01:00
jojo
efb1535211 Add BasicNoWater show mode
Add UpdateEntity_12
Add UpdateEntity_15
Add Advanced show mode WIP
Fix Recorder
2020-12-25 12:11:59 +01:00
jojo
7f42fffd0c Fix Kommata 2020-12-24 14:58:50 +01:00
jojo
e94fe80a49 Remove cluttered if 2020-12-24 14:33:28 +01:00
jojo
3f620559fe Update message 2020-12-24 11:27:27 +01:00
d7a786aad7 Classloader doesnt like multithreading... 2020-12-24 09:44:28 +01:00
jojo
d80e6d1a06 Add 0.5 tps up to 1 2020-12-22 21:01:29 +01:00
jojo
cc33517e6b Add TPSLimit for FallingBlock (Sand, Anvil, Concrete, etc.) 2020-12-22 20:27:27 +01:00
jojo
5022da13a8 Add if
Add var
Add info Variable code
Add ExecutionPoints for limiting server performance
2020-12-21 15:39:57 +01:00
jojo
3ad8bc4a06 Add VariableHolder 2020-12-21 13:15:05 +01:00
jojo
60e611a098 Add info feature 2020-12-21 12:48:32 +01:00
jojo
cf3eceedf6 Add Loop feature 2020-12-21 12:47:40 +01:00
edbba0f545 Improve join performance 2020-12-21 11:15:51 +01:00
jojo
1dd0bd7418 Add Copyright Notice 2020-12-19 20:11:02 +01:00
jojo
c1e9fe5664 Add Permission check 2020-12-19 20:01:59 +01:00
jojo
d00d0ad512 Add BasicShowMode 2020-12-19 20:01:26 +01:00
jojo
de9c79240a Add BasicShowMode 2020-12-19 18:16:23 +01:00
jojo
4824893d79 Add BasicShowMode 2020-12-19 17:49:35 +01:00
jojo
33584589a5 Start BasicShowMode 2020-12-19 14:42:50 +01:00
ba7888eb56 Lixfels trace changes 2020-12-18 22:38:31 +01:00
jojo
2ecd71baeb Simplify version dependant 2020-12-17 20:06:43 +01:00
jojo
19ee52aee5 Add ExplodeListener
Add RecordManager
Add RecordTrace
Add ShowTrace basics
Add TNTEntity basics
2020-12-17 19:43:30 +01:00
jojo
599c6049be Add Trace Record System 2020-12-16 16:27:08 +01:00
jojo
3cc70f1f71 Merge branch 'master' into Tracer-entity 2020-12-16 15:50:29 +01:00
jojo
f4aaefeb2b Fix message 2020-12-16 12:05:04 +01:00
jojo
bde263de50 Fix TPS Bugs with ScriptListener 2020-12-16 12:00:17 +01:00
jojo
b1ada402e3 Add message color codes 2020-12-16 11:58:44 +01:00
jojo
d24d4ee49f Update chat messages 2020-12-16 11:49:49 +01:00
jojo
e21fd6acfb Update chat messages 2020-12-16 11:40:12 +01:00
jojo
ee701cce0d Change ScripSystem prefix to BauSystem prefix 2020-12-16 11:32:10 +01:00
jojo
3cdfae7c86 Simplify Error messages for user 2020-12-16 11:31:27 +01:00
jojo
45eea9b26e Remove overhead from sleep Command 2020-12-16 11:09:10 +01:00
jojo
552649f884 Fix RightClickAir and LeftClickAir 2020-12-16 10:31:02 +01:00
jojo
4a9a317428 Simplify sleep Command
Simplify further command additions
2020-12-16 10:00:29 +01:00
jojo
203519b15f Add messages for player 2020-12-16 09:36:28 +01:00
jojo
93003de08d Make ScriptListener.ScriptExecutor.player final
Make ScriptListener.ScriptExecutor.commands final
Fixing commands without spaces
Fixing negative and zero sleepTime
Add Error message on sleep without number
Remove throw-away-references
2020-12-16 09:26:17 +01:00
jojo
15570cab7c Make Sleep 'CaSeInDePeNdEnCe'
Make Sleep Command like Bukkit Command (String.split(" "))
2020-12-16 09:08:27 +01:00
jojo
5b73ec5305 Fix ignored Sleep Time 2020-12-16 09:04:31 +01:00
jojo
00a77b378b Merge ScriptListener.Script and ScriptListener.ScriptExecutor 2020-12-16 09:04:18 +01:00
jojo
ee94b51612 Add basic sleep command to ScriptSystem 2020-12-15 20:33:40 +01:00
7f67333ea4 Merge branch 'master' into bauconfigRefactoring
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java
2020-12-12 17:15:45 +01:00
9126e6b303 Removing changes from player history 2020-12-12 17:13:43 +01:00
879585e542 Merge pull request 'Remove superflous chained command' (#138) from removeChained into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-12 16:44:59 +01:00
jojo
571e5a22ec Merge branch 'master' into ScriptComments
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java
2020-12-12 16:35:26 +01:00
c6e8cad799 Fix WE Security issue 2020-12-11 15:31:54 +01:00
e901568a07 Hotfix WE security issue 2020-12-11 15:19:15 +01:00
0f03e2b0a9 Hotfix WE security issue 2020-12-11 14:55:09 +01:00
2f123d9a97 Refactoring sections.yml, Adding Region.paste to player history 2020-12-11 14:33:00 +01:00
7f14182b8e Remove superflous chained command 2020-12-11 13:00:36 +01:00
4b1a03e5fb Fix script book in 1.12 2020-12-11 12:47:32 +01:00
YoyoSource
6dcda0f509 Add Comments to scripts 2020-12-10 21:30:31 +01:00