Skip to content

Commit e4f2fda

Browse files
committed
Revert FML events which didn't work anyway..
1 parent 86a7a8d commit e4f2fda

3 files changed

Lines changed: 2 additions & 218 deletions

File tree

‎src/avoid_loader/java/pl/olafcio/avoid_loader/interfaces/services/stage/fml/IFMLCowardlyEventStateListener.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/avoid_loader/java/pl/olafcio/avoid_loader/interfaces/services/stage/fml/IFMLLoadingExceptionListener.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎versions/forge/java/pl/olafcio/avoid_platform/PlatformFatalImpl.java‎

Lines changed: 2 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -1,187 +1,13 @@
11
package pl.olafcio.avoid_platform;
22

3-
import net.minecraftforge.fml.ModLoader;
4-
import net.minecraftforge.fml.ModLoadingException;
5-
import org.jetbrains.annotations.NotNull;
6-
import pl.olafcio.avoid_loader.PreModLoader;
73
import pl.olafcio.avoid_loader.interfaces.services.IModLoader;
84
import pl.olafcio.avoid_loader.interfaces.IMod;
95
import pl.olafcio.avoid_loader.interfaces.IModFile;
10-
import pl.olafcio.avoid_loader.interfaces.services.stage.fml.IFMLCowardlyEventStateListener;
11-
import pl.olafcio.avoid_loader.interfaces.services.stage.fml.IFMLLoadingExceptionListener;
126

13-
import java.util.*;
14-
import java.util.function.Consumer;
7+
import java.util.Collection;
8+
import java.util.List;
159

1610
public final class PlatformFatalImpl implements IModLoader {
17-
@Override
18-
@SuppressWarnings("unchecked")
19-
public void load() {
20-
var statusconsumer = (Optional<Consumer<String>>)
21-
Reflect.get(ModLoader.class, "statusConsumer", Optional.class, ModLoader.get());
22-
23-
Reflect.set(ModLoader.class, "statusConsumer", ModLoader.get(),
24-
this.make(statusconsumer.orElse(null)));
25-
26-
var loadingexceptions = (List<ModLoadingException>)
27-
Reflect.get(ModLoader.class, "loadingexceptions", List.class, ModLoader.get());
28-
29-
Reflect.set(ModLoader.class, "loadingexceptions", ModLoader.get(),
30-
this.make(loadingexceptions));
31-
}
32-
33-
private Optional<Consumer<String>> make(Consumer<String> delegate) {
34-
return Optional.of(t -> {
35-
if (t.equals("ERROR DURING MOD LOADING") && !Reflect.get(ModLoader.class, "loadingStateValid", boolean.class, ModLoader.get())) {
36-
var services = PreModLoader.getInstance().loadService(IFMLCowardlyEventStateListener.class);
37-
38-
for (var service : services)
39-
service.acknowledge();
40-
}
41-
42-
if (delegate != null)
43-
delegate.accept(t);
44-
});
45-
}
46-
47-
private List<ModLoadingException> make(List<ModLoadingException> delegate) {
48-
return new List<ModLoadingException>() {
49-
@Override
50-
public int size() {
51-
return delegate.size();
52-
}
53-
54-
@Override
55-
public boolean isEmpty() {
56-
return delegate.isEmpty();
57-
}
58-
59-
@Override
60-
public boolean contains(Object o) {
61-
return delegate.contains(o);
62-
}
63-
64-
@Override
65-
public @NotNull Iterator<ModLoadingException> iterator() {
66-
return delegate.iterator();
67-
}
68-
69-
@Override
70-
public @NotNull Object[] toArray() {
71-
return delegate.toArray();
72-
}
73-
74-
@Override
75-
public @NotNull <T> T[] toArray(@NotNull T[] a) {
76-
return delegate.toArray(a);
77-
}
78-
79-
@Override
80-
public boolean add(ModLoadingException e) {
81-
var services = PreModLoader.getInstance().loadService(IFMLLoadingExceptionListener.class);
82-
83-
for (var service : services)
84-
service.acknowledge(e);
85-
86-
return delegate.add(e);
87-
}
88-
89-
@Override
90-
public boolean remove(Object o) {
91-
return delegate.remove(o);
92-
}
93-
94-
@Override
95-
public boolean containsAll(@NotNull Collection<?> c) {
96-
return delegate.containsAll(c);
97-
}
98-
99-
@Override
100-
public boolean addAll(@NotNull Collection<? extends ModLoadingException> c) {
101-
for (var e : c) {
102-
var services = PreModLoader.getInstance().loadService(IFMLLoadingExceptionListener.class);
103-
104-
for (var service : services)
105-
service.acknowledge(e);
106-
}
107-
108-
return delegate.addAll(c);
109-
}
110-
111-
@Override
112-
public boolean addAll(int index, @NotNull Collection<? extends ModLoadingException> c) {
113-
for (var e : c) {
114-
var services = PreModLoader.getInstance().loadService(IFMLLoadingExceptionListener.class);
115-
116-
for (var service : services)
117-
service.acknowledge(e);
118-
}
119-
120-
return delegate.addAll(index, c);
121-
}
122-
123-
@Override
124-
public boolean removeAll(@NotNull Collection<?> c) {
125-
return delegate.removeAll(c);
126-
}
127-
128-
@Override
129-
public boolean retainAll(@NotNull Collection<?> c) {
130-
return delegate.retainAll(c);
131-
}
132-
133-
@Override
134-
public void clear() {
135-
delegate.clear();
136-
}
137-
138-
@Override
139-
public ModLoadingException get(int index) {
140-
return delegate.get(index);
141-
}
142-
143-
@Override
144-
public ModLoadingException set(int index, ModLoadingException element) {
145-
return delegate.set(index, element);
146-
}
147-
148-
@Override
149-
public void add(int index, ModLoadingException element) {
150-
delegate.add(index, element);
151-
}
152-
153-
@Override
154-
public ModLoadingException remove(int index) {
155-
return delegate.remove(index);
156-
}
157-
158-
@Override
159-
public int indexOf(Object o) {
160-
return delegate.indexOf(o);
161-
}
162-
163-
@Override
164-
public int lastIndexOf(Object o) {
165-
return delegate.lastIndexOf(o);
166-
}
167-
168-
@Override
169-
public @NotNull ListIterator<ModLoadingException> listIterator() {
170-
return delegate.listIterator();
171-
}
172-
173-
@Override
174-
public @NotNull ListIterator<ModLoadingException> listIterator(int index) {
175-
return delegate.listIterator(index);
176-
}
177-
178-
@Override
179-
public @NotNull List<ModLoadingException> subList(int fromIndex, int toIndex) {
180-
return delegate.subList(fromIndex, toIndex);
181-
}
182-
};
183-
}
184-
18511
@Override
18612
public Collection<IMod> process(IModFile modFile) {
18713
return List.of();

0 commit comments

Comments
 (0)